Julia Reynolds
5ab0e183ab
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
2015-08-07 16:29:41 +00:00
Geoff Mendal
75a77cc77d
am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
Import translations. DO NOT MERGE
2015-08-07 04:55:25 +00:00
Geoff Mendal
233f1b61ce
am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
Import translations. DO NOT MERGE
2015-08-07 04:48:08 +00:00
Geoff Mendal
6540a97291
am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
2015-08-07 04:44:05 +00:00
Geoff Mendal
2d546b77b9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Andres Morales
ae560bf189
am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
fix CC for work profiles
2015-08-06 22:41:42 +00:00
Andres Morales
13d387631f
am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
fix CC for work profiles
2015-08-06 22:36:04 +00:00
Andres Morales
d4c3dff6e3
am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5
Merge "fix CC for work profiles" into mnc-dev
2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124
Wrap text on long preferences.
...
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5
Hide optimization control on battery details page for non whitelisted apps.
...
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
79aed47747
am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
Import translations. DO NOT MERGE
2015-08-06 04:32:56 +00:00
Geoff Mendal
05facd935a
am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '18d8682802460074f4b0e628bae4d4051d542c77':
Import translations. DO NOT MERGE
2015-08-06 04:24:45 +00:00
Geoff Mendal
870ba02933
am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
...
* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
Import translations. DO NOT MERGE
2015-08-06 04:24:30 +00:00
Geoff Mendal
40f6e9ab3e
am 90c22976: (-s ours) Import translations. DO NOT MERGE
...
* commit '90c2297645341f347f56b160f06551963c64d039':
Import translations. DO NOT MERGE
2015-08-06 04:20:45 +00:00
Geoff Mendal
18d8682802
am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE
2015-08-06 04:20:33 +00:00
Andres Morales
7bdffd85eb
fix CC for work profiles
...
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -07:00
Geoff Mendal
90c2297645
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
2015-08-05 18:24:49 -07:00
Geoff Mendal
7930f872ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
2015-08-05 18:15:07 -07:00
Jason Monk
854533a82d
am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
...
* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
Hide show/hide system from battery optimizations list
2015-08-05 20:44:41 +00:00
Jason Monk
5b12cb7712
am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
...
* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
Hide show/hide system from battery optimizations list
2015-08-05 20:37:17 +00:00
Jason Monk
150e60ca9a
am 888673bd: Hide show/hide system from battery optimizations list
...
* commit '888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
2015-08-05 20:30:40 +00:00
Sanket Padawe
95a524a4ff
am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:27:24 +00:00
Sanket Padawe
eb04b01b3f
am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:20:47 +00:00
Sanket Padawe
ac02e250c1
am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:12:00 +00:00
Jason Monk
888673bd51
Hide show/hide system from battery optimizations list
...
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
2015-08-05 16:08:00 -04:00
Sanket Padawe
151612fb0d
am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:07:15 +00:00
Sanket Padawe
5f9d15ed25
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 18:28:12 +00:00
Ajay Panicker
e396c2241f
am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'f1ffec39b64d85b361f7814690fd5eec0a176f51':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:26:05 +00:00
Ajay Panicker
f1ffec39b6
am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:16:29 +00:00
Ajay Panicker
1dd985abdc
am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:01:14 +00:00
Ajay Panicker
cd8acb2256
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
2015-08-05 17:49:08 +00:00
Jason Monk
4734d829cd
am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '6be055a83dc6a70bbce04774b1725c8696abb1fa':
Remove summaries fro configure apps page
2015-08-05 17:09:10 +00:00
Jason Monk
6be055a83d
am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit 'c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
Remove summaries fro configure apps page
2015-08-05 17:01:02 +00:00
Jason Monk
c86f6dfdc8
am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
2015-08-05 16:48:13 +00:00
Geoff Mendal
ea1724e2c1
am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE
...
* commit '38911d7a719483ab5f3a7ea18608774183229091':
Import translations. DO NOT MERGE
2015-08-05 14:38:27 +00:00
Jason Monk
244fd78205
Merge "Remove summaries fro configure apps page" into mnc-dev
2015-08-05 14:34:14 +00:00
Geoff Mendal
38911d7a71
am 093f3746: (-s ours) Import translations. DO NOT MERGE
...
* commit '093f37469ae513c273b5d1ab44793f1041888676':
Import translations. DO NOT MERGE
2015-08-05 14:30:37 +00:00
Geoff Mendal
093f37469a
Import translations. DO NOT MERGE
...
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
2015-08-05 07:05:39 -07:00
Maurice Lam
944233e252
am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '5a07960889ca3c393e682c9ca1bbc2dff276ef1d':
[Fingerprint] Update string for enrolling
2015-08-05 01:05:42 +00:00
Maurice Lam
5a07960889
am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
[Fingerprint] Update string for enrolling
2015-08-05 00:56:58 +00:00
Maurice Lam
596a8a3c0a
am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
2015-08-05 00:46:11 +00:00
Maurice Lam
311a2d9525
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
2015-08-05 00:38:37 +00:00
Maurice Lam
c781bf30ad
am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:35:27 +00:00
Maurice Lam
e8f7ed9ea0
am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:27:22 +00:00
Maurice Lam
2a74b86238
am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
2015-08-05 00:09:32 +00:00
Maurice Lam
54a34ac6f9
am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
...
* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
[Fingerprint] Update string for enrolling
2015-08-04 23:43:00 +00:00
Maurice Lam
6eb6f924ac
am c48ea1f5: [Fingerprint] Update string for enrolling
...
* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
[Fingerprint] Update string for enrolling
2015-08-04 23:36:09 +00:00
Maurice Lam
c48ea1f586
[Fingerprint] Update string for enrolling
...
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
2015-08-04 23:08:10 +00:00
