Robin Lee
|
210b8a18cd
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: a28de3b8c5 am: 220aadbf9f am: ec36ab27cf
am: 1246772f88 -s ours
Change-Id: Iacb1e04de80ce05137da5098de35b94a0b6aafe4
|
2016-09-07 23:17:17 +00:00 |
|
Robin Lee
|
5623a59958
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2 am: ec5ceae174 am: 32daa7a95c am: 12c4d4132f
am: 30405e1562 -s ours
Change-Id: I7cc72d8c6d03f614a8a773fd6334ebea5186d7a7
|
2016-09-07 23:17:08 +00:00 |
|
Robin Lee
|
6cbc400f7a
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: 3485e31072
am: 1f1970c143 -s ours
Change-Id: I30f1310fec1b0a5d345d6f0750f7008ca3084850
|
2016-09-07 23:16:58 +00:00 |
|
Robin Lee
|
3a80c7574b
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2 am: 2450fb3d59
am: 14e5307189 -s ours
Change-Id: I36a46bf8263bbb33419272f4a37dffa66e524299
|
2016-09-07 23:12:37 +00:00 |
|
Michael Kwan
|
90baab9c2d
|
Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev am: 02014a62ab
am: 16dbec819a
Change-Id: Icb4caaf26574ff43fcf2447c02aa6452f89644ba
|
2016-09-07 23:12:33 +00:00 |
|
Michael Kwan
|
d9ec77f356
|
Ensure preference icon is returned when inflated from XML even if it has not been displayed yet. am: f049e24c64
am: 09ba4a4b78
Change-Id: Iba1881c8707bb5e7cfad317f536113508f5d00df
|
2016-09-07 23:12:28 +00:00 |
|
Wale Ogunwale
|
dd01ac724d
|
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev am: 36c4fc9779 am: d026b4460b
am: 4bb151c248
Change-Id: I41251975b945643e677f40fd03c6ec336bdfbf18
|
2016-09-07 23:12:23 +00:00 |
|
Wale Ogunwale
|
0187e48d79
|
Moved activity to stopped state if relaunched while device is asleep am: 3e99736b61 am: 3709ceaf45
am: b67011f662
Change-Id: I6b29da21368cf5b4d9289cc2123707b6cef743a1
|
2016-09-07 23:12:15 +00:00 |
|
Roshan Pius
|
f4e1ca7471
|
Merge "WifiManager: Remove unused methods" am: efb7bec56a am: 718c90daf1 am: 4898225abc
am: 186159de58
Change-Id: Ib934238d344f206990a31d99cf79e299e8fe8160
|
2016-09-07 23:08:07 +00:00 |
|
Makoto Onuki
|
4685647eca
|
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev am: bb69f55f17 am: 0ba73b9853
am: 3266e69160
Change-Id: Ifb1660d1671848ffcdfd43d807ce9ec488df8b61
|
2016-09-07 23:05:38 +00:00 |
|
Suprabh Shukla
|
f9c376b786
|
resolve merge conflicts of 37ad463 to master
Change-Id: I51b2097ac3ea4ce3ec8bb29e674d1cdd789aa1a1
|
2016-09-07 15:55:04 -07:00 |
|
TreeHugger Robot
|
e0d569b88c
|
Merge "AAPT2: Fix issue with styled string indices"
|
2016-09-07 22:42:38 +00:00 |
|
Robin Lee
|
1246772f88
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: a28de3b8c5 am: 220aadbf9f
am: ec36ab27cf
Change-Id: I1d239d231b71f597907895de0903c2990001887c
|
2016-09-07 22:34:31 +00:00 |
|
Robin Lee
|
30405e1562
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2 am: ec5ceae174 am: 32daa7a95c
am: 12c4d4132f
Change-Id: Ibb81c52d9d020da5c17049aeb4aced2d798228a0
|
2016-09-07 22:34:23 +00:00 |
|
Robin Lee
|
ec36ab27cf
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: a28de3b8c5
am: 220aadbf9f
Change-Id: I7469041bfbbde9f533fdcd4e5f39d8dff94c0aad
|
2016-09-07 22:29:17 +00:00 |
|
Robin Lee
|
12c4d4132f
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2 am: ec5ceae174
am: 32daa7a95c
Change-Id: I8580890ee0fcd6b1fb80352b4437d2a1379dfaee
|
2016-09-07 22:29:13 +00:00 |
|
Robin Lee
|
1f1970c143
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2
am: 3485e31072
Change-Id: I8b84b8a48415cf416f124a8572401521c0ea796d
|
2016-09-07 22:23:28 +00:00 |
|
Robin Lee
|
14e5307189
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2
am: 2450fb3d59
Change-Id: Iaf63a842b0132fec2616902dcb24d9e4cf442803
|
2016-09-07 22:23:26 +00:00 |
|
Robin Lee
|
220aadbf9f
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2
am: a28de3b8c5
Change-Id: I8af478fbc7eb8c62142769cd0f23a33cb3c821c3
|
2016-09-07 22:23:12 +00:00 |
|
Robin Lee
|
32daa7a95c
|
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2
am: ec5ceae174
Change-Id: Ic4bbce08944881f0d20a08c1ebb4db5531208f23
|
2016-09-07 22:23:10 +00:00 |
|
Michael Kwan
|
16dbec819a
|
Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev
am: 02014a62ab
Change-Id: Ia2637175965656bab350c7d479266093ff5764be
|
2016-09-07 22:15:58 +00:00 |
|
Michael Kwan
|
09ba4a4b78
|
Ensure preference icon is returned when inflated from XML even if it has not been displayed yet.
am: f049e24c64
Change-Id: Iab0a315f916fe7da2b2a523f364be5a6842aadbd
|
2016-09-07 22:15:53 +00:00 |
|
Robin Lee
|
a28de3b8c5
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am: fb2cdce7c2
Change-Id: I50be838e9f0f9e794389f6d24a5e699d7f163caf
|
2016-09-07 22:15:30 +00:00 |
|
Robin Lee
|
ec5ceae174
|
DO NOT MERGE Stop work challenge freeform bypass
am: 0737c2b4c2
Change-Id: Ia76391f710e42e9634010bd211a0370230b318e3
|
2016-09-07 22:15:28 +00:00 |
|
Robin Lee
|
3485e31072
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am: fb2cdce7c2
Change-Id: Ib97afbd6e74bc4b35cd6a5014815c3f801078413
|
2016-09-07 22:15:27 +00:00 |
|
Robin Lee
|
2450fb3d59
|
DO NOT MERGE Stop work challenge freeform bypass
am: 0737c2b4c2
Change-Id: Ib613296306978c0bfbf1ea6e1dcdb7a72b867a55
|
2016-09-07 22:15:22 +00:00 |
|
Wale Ogunwale
|
4bb151c248
|
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev am: 36c4fc9779
am: d026b4460b
Change-Id: Id7ca4b27fdc5a2cc6a0b9e40f6952fe504718353
|
2016-09-07 22:10:57 +00:00 |
|
Wale Ogunwale
|
b67011f662
|
Moved activity to stopped state if relaunched while device is asleep am: 3e99736b61
am: 3709ceaf45
Change-Id: I891c371dc6f2eeab29349d6b446e0e82e4166861
|
2016-09-07 22:10:47 +00:00 |
|
TreeHugger Robot
|
fb2cdce7c2
|
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
|
2016-09-07 22:07:21 +00:00 |
|
TreeHugger Robot
|
02014a62ab
|
Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev
|
2016-09-07 22:05:06 +00:00 |
|
Roshan Pius
|
186159de58
|
Merge "WifiManager: Remove unused methods" am: efb7bec56a am: 718c90daf1
am: 4898225abc
Change-Id: I7bc7504eaa93b25d6aec1b4b5e337a14085639e7
|
2016-09-07 22:02:59 +00:00 |
|
Wale Ogunwale
|
d026b4460b
|
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev
am: 36c4fc9779
Change-Id: I206939f60b4ff73736377b63e3f651be1bd2992a
|
2016-09-07 22:01:15 +00:00 |
|
Wale Ogunwale
|
3709ceaf45
|
Moved activity to stopped state if relaunched while device is asleep
am: 3e99736b61
Change-Id: I38552093c320d5c4ff74e615ae8b9959f306cd82
|
2016-09-07 22:01:11 +00:00 |
|
Roshan Pius
|
4898225abc
|
Merge "WifiManager: Remove unused methods" am: efb7bec56a
am: 718c90daf1
Change-Id: I8f2ead6f404dd3bdb1106d22f2fde756daef4cc8
|
2016-09-07 21:57:25 +00:00 |
|
TreeHugger Robot
|
36c4fc9779
|
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev
|
2016-09-07 21:57:08 +00:00 |
|
Roshan Pius
|
718c90daf1
|
Merge "WifiManager: Remove unused methods"
am: efb7bec56a
Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3
|
2016-09-07 21:51:18 +00:00 |
|
Jorim Jaggi
|
8f2a16c019
|
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev am: bcf32170b3 am: 033b50645e
am: d193a74f7a
Change-Id: Ia2416ddea34c0a7833a0ebc349636fa3e8e85069
|
2016-09-07 21:48:39 +00:00 |
|
Jorim Jaggi
|
5f6baf891d
|
Fix slow PIN dismiss animation am: 6bd3890ff9 am: 2db2153719
am: 90e224bda9
Change-Id: Iea4072a619d6a7ba058da0bd2e8c01d323f29fd1
|
2016-09-07 21:48:34 +00:00 |
|
Makoto Onuki
|
3266e69160
|
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev am: bb69f55f17
am: 0ba73b9853
Change-Id: Idf69d1f9c73cadc3f218912669abfc73a280d49f
|
2016-09-07 21:47:52 +00:00 |
|
Makoto Onuki
|
37ad4639bb
|
Allow DO/PO to be installed with certain preconfigured accounts. am: 5e7e0670c7
am: 9d46e5e044
Change-Id: I6a55f788b12c93b7be0503300c171f7f5a40fe9d
|
2016-09-07 21:47:47 +00:00 |
|
Treehugger Robot
|
efb7bec56a
|
Merge "WifiManager: Remove unused methods"
|
2016-09-07 21:43:20 +00:00 |
|
Jorim Jaggi
|
d193a74f7a
|
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev am: bcf32170b3
am: 033b50645e
Change-Id: I0ed862dfaa3170a58d8ffc6cc86ac650c0855dd8
|
2016-09-07 21:42:07 +00:00 |
|
Jorim Jaggi
|
90e224bda9
|
Fix slow PIN dismiss animation am: 6bd3890ff9
am: 2db2153719
Change-Id: I49c639a9a6fee09f9a3361e1a91f57b492e060cb
|
2016-09-07 21:41:56 +00:00 |
|
Makoto Onuki
|
0ba73b9853
|
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev
am: bb69f55f17
Change-Id: I39962983e4deb149f6169f78c3db76d7d5f8f26e
|
2016-09-07 21:40:22 +00:00 |
|
Makoto Onuki
|
9d46e5e044
|
Allow DO/PO to be installed with certain preconfigured accounts.
am: 5e7e0670c7
Change-Id: I9191a60bf4071b8205c04131cb2d97ef1a32fb19
|
2016-09-07 21:40:20 +00:00 |
|
Makoto Onuki
|
bb69f55f17
|
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev
|
2016-09-07 21:36:38 +00:00 |
|
Jorim Jaggi
|
033b50645e
|
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev
am: bcf32170b3
Change-Id: Id3f66ab179421f6ff0d85128b06c5acf82209b11
|
2016-09-07 21:35:29 +00:00 |
|
Jorim Jaggi
|
2db2153719
|
Fix slow PIN dismiss animation
am: 6bd3890ff9
Change-Id: I57e22cb3eee40e7e06267494314f8e1369caf5e2
|
2016-09-07 21:35:27 +00:00 |
|
Alan Viverette
|
79e60a7adc
|
Merge "Support library 24.2.0 API diff" into nyc-dev am: 9d25bf73a4 am: 75136ac15b am: f3c21a8950 am: 8f76ea793d
am: 6779957d69
Change-Id: Ie6dca6d708b19609b4df7491e7bc5700e28deb0c
|
2016-09-07 21:19:28 +00:00 |
|
Alan Viverette
|
f27b9c0069
|
Support library 24.2.0 API diff am: ae3fecc1a9 am: 56477c1fcb am: c2ca61749d am: bffe9063e1
am: aeb275a5f0
Change-Id: Idfe8c8d8791a6d06cbbe7a63f12b2ebc3f3b34ea
|
2016-09-07 21:19:18 +00:00 |
|