Commit Graph

24638 Commits

Author SHA1 Message Date
Geoff Mendal
3203791351 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-05 15:30:33 +00:00
Geoff Mendal
71f3c7791b Import translations. DO NOT MERGE
Change-Id: Iaf5ad5766d6f6fbd163d612ad1314f62cf07cc1d
Auto-generated-cl: translation import
2015-10-05 07:42:17 -07:00
Geoff Mendal
c4a6faa9f3 Merge "Import translations. DO NOT MERGE" 2015-10-05 13:54:42 +00:00
Geoff Mendal
557a0e7195 Import translations. DO NOT MERGE
Change-Id: I9c16d16ee3d19b32203b3591dfb93a341fab76db
Auto-generated-cl: translation import
2015-10-05 06:51:01 -07:00
Geoff Mendal
faf4cb2bbd am 8af3e683: (-s ours) am 5073cf5d: (-s ours) am 223b9739: (-s ours) am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '8af3e68309562f633892d1fb14b76b99be54c5d5':
  Import translations. DO NOT MERGE
2015-10-05 13:25:14 +00:00
Geoff Mendal
8af3e68309 am 5073cf5d: (-s ours) am 223b9739: (-s ours) am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '5073cf5dbf2c754baa2b77ba741e0ea5babfd23e':
  Import translations. DO NOT MERGE
2015-10-05 13:19:24 +00:00
Geoff Mendal
5073cf5dbf am 223b9739: (-s ours) am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '223b9739a9debdbdfd2a4d3b42c66c36d04d21cd':
  Import translations. DO NOT MERGE
2015-10-05 13:13:40 +00:00
Geoff Mendal
223b9739a9 am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '37166a4cf69254d5993d25c4e2a446bb5555411e':
  Import translations. DO NOT MERGE
2015-10-05 13:06:50 +00:00
Geoff Mendal
37166a4cf6 am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit 'a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0':
  Import translations. DO NOT MERGE
2015-10-05 13:01:52 +00:00
Geoff Mendal
8ba45cf900 am 41301f18: (-s ours) am 404d21fa: (-s ours) am bcc5b07e: (-s ours) am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '41301f1806782a607377e341e86f05dbeaf8a6b9':
  Import translations. DO NOT MERGE
2015-10-05 12:58:40 +00:00
Geoff Mendal
a4cd63f6cc am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '032262578565c928b47996d096f3518cf1f09aa7':
  Import translations. DO NOT MERGE
2015-10-05 12:55:55 +00:00
Geoff Mendal
41301f1806 am 404d21fa: (-s ours) am bcc5b07e: (-s ours) am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '404d21fa17f250f3d1df04726a2e6be71d9a3f35':
  Import translations. DO NOT MERGE
2015-10-05 12:54:44 +00:00
Geoff Mendal
0322625785 am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
  Import translations. DO NOT MERGE
2015-10-05 12:52:33 +00:00
Geoff Mendal
404d21fa17 am bcc5b07e: (-s ours) am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit 'bcc5b07e99d6947ee4d0c9430899ce5485bcbaea':
  Import translations. DO NOT MERGE
2015-10-05 12:48:14 +00:00
Geoff Mendal
45335b0c5e am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE
2015-10-05 12:45:22 +00:00
Geoff Mendal
bcc5b07e99 am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '7521c1a03e929ab7d26d4492a434a4b33bfe52c3':
  Import translations. DO NOT MERGE
2015-10-05 12:42:21 +00:00
Geoff Mendal
0070fbfe01 am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE
2015-10-05 12:41:50 +00:00
Geoff Mendal
7521c1a03e am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '82c61b2dd878eae9a30bd7953bf3e2390e1e5611':
  Import translations. DO NOT MERGE
2015-10-05 12:34:59 +00:00
Geoff Mendal
f033837677 Import translations. DO NOT MERGE
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
2015-10-05 05:33:27 -07:00
Geoff Mendal
82c61b2dd8 am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '010d2fcd2a4b8fda906ff0a0e04554475a45489c':
  Import translations. DO NOT MERGE
2015-10-05 12:32:07 +00:00
Geoff Mendal
010d2fcd2a Import translations. DO NOT MERGE
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
2015-10-05 05:20:30 -07:00
Maurice Lam
ef9d636376 Merge "[WifiSettings] Add Wi-Fi dialog activity" 2015-10-01 17:24:52 +00:00
Julia Reynolds
239986eec9 Merge "Update zen rule type selection and view." 2015-10-01 12:36:14 +00:00
Zach Kuznia
c39dc017a7 am ff66f8b5: am 24cb6374: am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit 'ff66f8b5f11248a9dfb66ef23d2c6a5be4847fdb':
  Allow manual to be read from disk
2015-10-01 00:34:22 +00:00
Zach Kuznia
ff66f8b5f1 am 24cb6374: am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit '24cb6374df50a6ea5978fb9851e4030ac9924307':
  Allow manual to be read from disk
2015-10-01 00:28:33 +00:00
Zach Kuznia
24cb6374df am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit 'a8f3f067b672a8e055e76beee300cc2b1a8bea31':
  Allow manual to be read from disk
2015-10-01 00:23:58 +00:00
Zach Kuznia
a8f3f067b6 am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit 'ae8aea76e5cbef1eefde401f8622d05275156cf7':
  Allow manual to be read from disk
2015-10-01 00:15:52 +00:00
Zach Kuznia
ae8aea76e5 Merge "Allow manual to be read from disk" into mnc-dr-dev 2015-10-01 00:08:05 +00:00
Maurice Lam
e618babe5a Merge "Remove outdated setup wizard widgets" 2015-09-30 20:41:15 +00:00
Geoff Mendal
fcb6b63fdd am 205365eb: (-s ours) am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '205365eb482dcb4ec86be53e2b073269c7aabf6a':
  Import translations. DO NOT MERGE
2015-09-30 20:36:52 +00:00
Geoff Mendal
205365eb48 am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '7b03d10f58453873e1527384e9cdc579858d9d67':
  Import translations. DO NOT MERGE
2015-09-30 20:27:37 +00:00
Geoff Mendal
7b03d10f58 am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '21416b8318ae2dd63296a255ae8bc0f0bdda1fa4':
  Import translations. DO NOT MERGE
2015-09-30 20:21:19 +00:00
Geoff Mendal
21416b8318 am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1207a50100bbb3aaa55fc6394e13ad18fc019f8e':
  Import translations. DO NOT MERGE
2015-09-30 20:11:24 +00:00
Julia Reynolds
f7748e4ae1 Update zen rule type selection and view.
Separate rule type selection from naming, launch 3P UI for non-system rules.

Bug: 22977552
Change-Id: Ifbd82da2192c4aaf5f239a188a016d9e1af542d6
2015-09-30 16:00:19 -04:00
Julia Reynolds
a3b0c07a57 Merge "Use public APIs for modifying automatic zen rules." 2015-09-30 18:13:47 +00:00
Geoff Mendal
1207a50100 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-30 16:48:17 +00:00
Geoff Mendal
eb06d4a9c2 Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
2015-09-30 07:42:27 -07:00
Geoff Mendal
d0dcefdb01 Merge "Import translations. DO NOT MERGE" 2015-09-30 13:54:49 +00:00
Geoff Mendal
4ac45452e7 Import translations. DO NOT MERGE
Change-Id: Ic5bf85d4dc5a61e5dddbf8d75c9cc5799ca0124c
Auto-generated-cl: translation import
2015-09-30 06:51:56 -07:00
Geoff Mendal
587732d41d am 883773ff: (-s ours) am 48fab9d1: (-s ours) am 82c45e07: (-s ours) am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '883773ff19de8dd12e8df101b30f5631b05d6118':
  Import translations. DO NOT MERGE
2015-09-30 13:19:49 +00:00
Geoff Mendal
883773ff19 am 48fab9d1: (-s ours) am 82c45e07: (-s ours) am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '48fab9d10ab12fb015e964e0e766091f485843ef':
  Import translations. DO NOT MERGE
2015-09-30 13:14:11 +00:00
Geoff Mendal
48fab9d10a am 82c45e07: (-s ours) am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '82c45e07c2c6771142ad7b7dffaae23f9151d597':
  Import translations. DO NOT MERGE
2015-09-30 13:11:18 +00:00
Geoff Mendal
82c45e07c2 am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '4446480e7f468afbc55fc3c18abb05ca77eb03be':
  Import translations. DO NOT MERGE
2015-09-30 13:08:11 +00:00
Geoff Mendal
4446480e7f am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '0929be6613afbf01c313e94f019a0a3d30c9a0a4':
  Import translations. DO NOT MERGE
2015-09-30 13:02:08 +00:00
Julia Reynolds
7d8a9aead5 Use public APIs for modifying automatic zen rules.
Bug: 22977552
Change-Id: I544f1462ad77cdeb33ccff3c9de11ea37df5505d
2015-09-30 08:57:47 -04:00
Geoff Mendal
0929be6613 am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit 'dffcc532693c4bc6e07cf05ac532148612a94176':
  Import translations. DO NOT MERGE
2015-09-30 12:57:33 +00:00
Geoff Mendal
8f849ddf13 am e6d6fe8a: (-s ours) am 722737c4: (-s ours) am a462b286: (-s ours) am 99842468: (-s ours) am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit 'e6d6fe8a6faa358e930363f706fbbd878e391b6d':
  Import translations. DO NOT MERGE
2015-09-30 12:57:21 +00:00
Geoff Mendal
e6d6fe8a6f am 722737c4: (-s ours) am a462b286: (-s ours) am 99842468: (-s ours) am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '722737c43b43a5373ff8fdb21b0e6516ff1886c8':
  Import translations. DO NOT MERGE
2015-09-30 12:52:20 +00:00
Geoff Mendal
dffcc53269 am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit 'c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
  Import translations. DO NOT MERGE
2015-09-30 12:51:15 +00:00
Geoff Mendal
c7b0a81625 am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE
2015-09-30 12:47:04 +00:00