Jason Monk
|
39c9460f38
|
am 5bc0d610: am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '5bc0d610ab0dc003afe356a1c8851d668ad2f5d8':
Don't show disabled apps in ignore optimizations
|
2015-07-24 04:50:02 +00:00 |
|
Guang Zhu
|
5e83b0d9fa
|
am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
Prevent monkey from changing adoptable storage settings
|
2015-07-24 04:50:00 +00:00 |
|
Pavel Zhamaitsiak
|
2fab133a24
|
am 5d652622: am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '5d652622e836738cff848ec4597ddaca92658db5':
Add or remove WFC setting when Wireless settings activity is resumed
|
2015-07-24 04:49:59 +00:00 |
|
Colin Cross
|
dab025bdff
|
resolved conflicts for merge of 769ba03b to master
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
|
2015-07-23 21:43:07 -07:00 |
|
Maurice Lam
|
4ac567acce
|
am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '11d1f6d3a135d85511fd5067012c29e4e17b346a':
[Fingerprint] Show skip button during SUW
|
2015-07-24 04:38:06 +00:00 |
|
Geoff Mendal
|
25c404e5bd
|
am 217aebd3: (-s ours) am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '217aebd32d709571d4fb765d498bb90ab23a9b53':
Import translations. DO NOT MERGE
|
2015-07-24 03:46:11 +00:00 |
|
Geoff Mendal
|
4a74e0761d
|
am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit '03fe71ed0067a1c6937569ade4c583a914034173':
Import translations. DO NOT MERGE
|
2015-07-24 03:46:10 +00:00 |
|
Svetoslav Ganov
|
104c3d3d64
|
am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit 'ea80c4b2512a79e964968e235c85b145a089d3b9':
Reset permissions and app links when clearing app preferences - settings
|
2015-07-24 03:46:08 +00:00 |
|
Jason Monk
|
6d2802502c
|
am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit 'c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
Fix battery detail issues with "Android OS"
|
2015-07-24 03:46:07 +00:00 |
|
Jason Monk
|
5bc0d610ab
|
am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit 'c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
Don't show disabled apps in ignore optimizations
|
2015-07-24 03:46:06 +00:00 |
|
Guang Zhu
|
29936b072f
|
am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
Prevent monkey from changing adoptable storage settings
|
2015-07-24 03:46:04 +00:00 |
|
Pavel Zhamaitsiak
|
5d652622e8
|
am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
Add or remove WFC setting when Wireless settings activity is resumed
|
2015-07-24 03:45:57 +00:00 |
|
Jason Monk
|
769ba03b8f
|
am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
|
2015-07-24 03:45:55 +00:00 |
|
Maurice Lam
|
11d1f6d3a1
|
am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
[Fingerprint] Show skip button during SUW
|
2015-07-24 03:34:46 +00:00 |
|
Geoff Mendal
|
217aebd32d
|
am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '13cd0b25734e215f3369b0c5367dafdc74c070da':
Import translations. DO NOT MERGE
|
2015-07-24 03:26:34 +00:00 |
|
Geoff Mendal
|
03fe71ed00
|
am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit 'cb113be57e3eb49871c77ce5317d644963e033af':
Import translations. DO NOT MERGE
|
2015-07-24 03:26:33 +00:00 |
|
Svetoslav Ganov
|
ea80c4b251
|
am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
Reset permissions and app links when clearing app preferences - settings
|
2015-07-24 03:26:31 +00:00 |
|
Jason Monk
|
c9607b39f8
|
am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit 'e9b97364157c83ed9823f323e2f515bc2e5fc8be':
Fix battery detail issues with "Android OS"
|
2015-07-24 03:26:30 +00:00 |
|
Jason Monk
|
c19eac29b6
|
am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '9b6ff57eb550215c30a16225e59a2c4d0af7de92':
Don't show disabled apps in ignore optimizations
|
2015-07-24 03:26:29 +00:00 |
|
Guang Zhu
|
5ea94a9c4d
|
am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit 'b91da24db774829315087af3af09c90e89f496cb':
Prevent monkey from changing adoptable storage settings
|
2015-07-24 03:26:26 +00:00 |
|
Pavel Zhamaitsiak
|
ff381a20ca
|
am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'a20eaca1a68138e1077af72bca7f6e76f4332abe':
Add or remove WFC setting when Wireless settings activity is resumed
|
2015-07-24 03:26:25 +00:00 |
|
Jason Monk
|
0557f4c353
|
am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
Remove tuner from development settings
|
2015-07-24 03:26:23 +00:00 |
|
Maurice Lam
|
f16673bab6
|
am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
[Fingerprint] Show skip button during SUW
|
2015-07-24 03:17:43 +00:00 |
|
Geoff Mendal
|
13cd0b2573
|
am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit 'f305e853a97be420eca536a510d8dca1c9877ef9':
Import translations. DO NOT MERGE
|
2015-07-24 03:13:06 +00:00 |
|
Geoff Mendal
|
cb113be57e
|
am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit '28718aebd187fe68cf923422cde80103b0f6cbca':
Import translations. DO NOT MERGE
|
2015-07-24 03:13:04 +00:00 |
|
Svetoslav Ganov
|
1fa5f4b336
|
am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
Reset permissions and app links when clearing app preferences - settings
|
2015-07-24 03:10:41 +00:00 |
|
Jason Monk
|
e9b9736415
|
am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
Fix battery detail issues with "Android OS"
|
2015-07-24 03:10:07 +00:00 |
|
Jason Monk
|
9b6ff57eb5
|
am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
Don't show disabled apps in ignore optimizations
|
2015-07-24 03:10:05 +00:00 |
|
Maurice Lam
|
36c7601409
|
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
|
2015-07-24 03:08:29 +00:00 |
|
Guang Zhu
|
b91da24db7
|
am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
Prevent monkey from changing adoptable storage settings
|
2015-07-24 03:03:26 +00:00 |
|
Pavel Zhamaitsiak
|
a20eaca1a6
|
am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
Add or remove WFC setting when Wireless settings activity is resumed
|
2015-07-24 03:03:24 +00:00 |
|
Jason Monk
|
b46b993403
|
am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
Remove tuner from development settings
|
2015-07-24 03:03:23 +00:00 |
|
Geoff Mendal
|
f305e853a9
|
am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '5376d54e8eccc45586e5225b6ec7d6637399270f':
Import translations. DO NOT MERGE
|
2015-07-24 01:40:16 +00:00 |
|
Geoff Mendal
|
28718aebd1
|
Import translations. DO NOT MERGE
Change-Id: I52c34f9ee160ac6f8ce81d8922a6d363ca0f348f
Auto-generated-cl: translation import
|
2015-07-23 18:23:19 -07:00 |
|
Geoff Mendal
|
5376d54e8e
|
Import translations. DO NOT MERGE
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
|
2015-07-23 18:10:24 -07:00 |
|
Geoff Mendal
|
e9f9ea3aff
|
Import translations. DO NOT MERGE
Change-Id: Ib963e118d1a07d17e7fa824a39f72d6611366804
Auto-generated-cl: translation import
|
2015-07-23 17:57:24 -07:00 |
|
Selim Cinek
|
b48e9fdcab
|
Adapted a string in the fingerprint enrollment flow
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
|
2015-07-23 15:29:01 -07:00 |
|
Svetoslav Ganov
|
6c2d4d7346
|
am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit 'cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
Reset permissions and app links when clearing app preferences - settings
|
2015-07-23 21:56:56 +00:00 |
|
Svetoslav Ganov
|
cce844a7a3
|
Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
|
2015-07-23 21:47:10 +00:00 |
|
Jason Monk
|
14983fc664
|
am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"
|
2015-07-23 20:32:34 +00:00 |
|
Jason Monk
|
a119087b8b
|
am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
Don't show disabled apps in ignore optimizations
|
2015-07-23 20:32:32 +00:00 |
|
Maurice Lam
|
95d1eb90d3
|
am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
[ScreenLock] Style encryption interstitial in SUW
|
2015-07-23 20:26:15 +00:00 |
|
Maurice Lam
|
4e05ceea19
|
am 3b798650: am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '3b798650fc30a6b2b3b7a28325b7b40b8173baf1':
[Fingerprint] Send RESULT_CANCELED when back from Add another
|
2015-07-23 20:26:14 +00:00 |
|
Maurice Lam
|
1f95e5125f
|
am 3f7ff2b6: am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '3f7ff2b60f85cf9bb39e3bb3551bcdbfa916fafa':
[ScreenLock] Update illustration during setup wizard
|
2015-07-23 20:26:12 +00:00 |
|
Jason Monk
|
8bf5f3075e
|
Merge "Fix battery detail issues with "Android OS"" into mnc-dev
|
2015-07-23 20:23:57 +00:00 |
|
Jason Monk
|
9927acd3ad
|
Merge "Don't show disabled apps in ignore optimizations" into mnc-dev
|
2015-07-23 20:23:09 +00:00 |
|
Maurice Lam
|
cff4eb9b73
|
am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
[ScreenLock] Style encryption interstitial in SUW
|
2015-07-23 20:09:28 +00:00 |
|
Maurice Lam
|
3b798650fc
|
am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
[Fingerprint] Send RESULT_CANCELED when back from Add another
|
2015-07-23 20:09:27 +00:00 |
|
Maurice Lam
|
3f7ff2b60f
|
am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
[ScreenLock] Update illustration during setup wizard
|
2015-07-23 20:09:26 +00:00 |
|
Maurice Lam
|
ea0f0fdfa2
|
am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
[ScreenLock] Style encryption interstitial in SUW
|
2015-07-23 19:46:31 +00:00 |
|