Android Build Merger (Role)
|
d44a36588d
|
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 am: 0792846ea5" into nyc-mr2-dev-plus-aosp
|
2017-02-03 01:35:59 +00:00 |
|
Jeff Sharkey
|
1834734eef
|
DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: cc17b28c0c
Change-Id: I3b03f78cfd1169d04502abc48e3647d7eb39f085
|
2017-02-03 01:35:56 +00:00 |
|
Jeff Sharkey
|
e8895e868e
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148
Change-Id: I3f313eea586334158e710ca4a6545127e7fa8855
|
2017-02-03 01:35:51 +00:00 |
|
Jeff Sharkey
|
04bfaf9749
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148
am: 0792846ea5
Change-Id: I389df4e503e76b311a9b93e3327b423b07e7de26
|
2017-02-03 01:35:03 +00:00 |
|
Jeff Sharkey
|
579dd3b014
|
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b
am: 6529292783
Change-Id: Iebcdf8ff79316c718a461445eba8169c68d00e1b
|
2017-02-03 01:34:48 +00:00 |
|
Jeff Sharkey
|
de02369ab9
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb
Change-Id: I92db1043b77799dd3c7a9c6852c258bc0d5aa8ed
|
2017-02-03 01:34:46 +00:00 |
|
Yohei Yukawa
|
74e5ff6e92
|
Merge "Simplify the constructor of InputMethodInfo"
|
2017-02-03 01:33:42 +00:00 |
|
Jeff Sharkey
|
42dbff71a1
|
DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481
am: 825a242ea9
Change-Id: If76c1073c80718296c814b43971b89f642ada7c9
|
2017-02-03 01:33:41 +00:00 |
|
Suprabh Shukla
|
1a934fe836
|
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours
am: e12285ac47 -s ours
Change-Id: I241cf4fcfae223ab115aff90ba70ac84a2e773d4
|
2017-02-03 01:32:51 +00:00 |
|
Jeff Sharkey
|
d4adaada55
|
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3
am: 1eb2ded281
Change-Id: I7ceae022988bc333631cd83eed868ae573096bb4
|
2017-02-03 01:32:11 +00:00 |
|
Suprabh Shukla
|
20ddce2633
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours
am: b696cba781 -s ours
Change-Id: Ifedcf384ac1fd3960045ab1481c2aaedb7c39264
|
2017-02-03 01:31:40 +00:00 |
|
Jeff Sharkey
|
1d5d7d1a5f
|
DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29
am: e6f2767d54
Change-Id: I4598997f5c121f81170fc29d52151e727e143ead
|
2017-02-03 01:31:09 +00:00 |
|
Jeff Sharkey
|
0387fd89f2
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98
Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258
|
2017-02-03 01:30:51 +00:00 |
|
Jeff Sharkey
|
d96c17f7df
|
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3
am: 1e9b978dc7
Change-Id: I23fe0c7c446c3c2ed0570606a4ac9860df866295
|
2017-02-03 01:30:04 +00:00 |
|
Jeff Sharkey
|
87ae27b020
|
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25
am: 6cfa84791d
Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7
|
2017-02-03 01:30:01 +00:00 |
|
Android Build Merger (Role)
|
f6fa670588
|
Merge "DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb am: b93bc585f0" into nyc-mr2-dev-plus-aosp
|
2017-02-03 01:29:33 +00:00 |
|
Jason Long
|
8f60ea6360
|
Pass token to AutoFillUI.
Bug: 31001899, 34637800
Test: CTS
Change-Id: If0d0a283aebd48db2694c3dcef5d3e077a9fa1f8
|
2017-02-02 17:29:29 -08:00 |
|
Jeff Sharkey
|
a53b4376eb
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb
am: b93bc585f0
Change-Id: Ic6f3436322ba32797858d454d53b8210b46e0f29
|
2017-02-03 01:28:59 +00:00 |
|
Jeff Sharkey
|
0792846ea5
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148
Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5
|
2017-02-03 01:28:54 +00:00 |
|
Jeff Sharkey
|
7b2985bc9e
|
DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6
am: 2e3a277175
Change-Id: Ifc5567bfeb3736c96d3637bfb98b61609b0dbfda
|
2017-02-03 01:28:43 +00:00 |
|
Jeff Sharkey
|
626d56f2bf
|
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c
am: 76ce0386db
Change-Id: I1a5282c25eba331df935ab2863c33406e8b694fb
|
2017-02-03 01:27:32 +00:00 |
|
Suprabh Shukla
|
e654f46e20
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc
am: 20d2868f5c
Change-Id: Iaa64dee6de0055daa896ab548756f70eb9dd4ca8
|
2017-02-03 01:27:29 +00:00 |
|
Jeff Sharkey
|
030e74a380
|
DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9
am: 8501b686f7
Change-Id: Icd5ceccc8048ca31363a190d66a3f9d0dff84e1c
|
2017-02-03 01:26:36 +00:00 |
|
Suprabh Shukla
|
d11c7025cd
|
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd
am: cb84f799ff
Change-Id: Ic1bffe4a69db81544bfff9543ae94aed0ee4a0f3
|
2017-02-03 01:26:20 +00:00 |
|
Jeff Sharkey
|
af86efd70d
|
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6
am: 609145c315
Change-Id: I604956b3959cad56e7fa7c39e4fd51fc8c42a5c7
|
2017-02-03 01:25:39 +00:00 |
|
Jeff Sharkey
|
b93bc585f0
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb
Change-Id: I78fd2fdabdbaf2d10f930a0ccc46cb9380b4b5ad
|
2017-02-03 01:25:30 +00:00 |
|
Suprabh Shukla
|
d4b5177f68
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115
am: 7c6d80e66c
Change-Id: Ia28ea9874cabde49ce481000e1bdba3d709eaecb
|
2017-02-03 01:25:19 +00:00 |
|
Jeff Sharkey
|
cc17b28c0c
|
DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe
am: e25ab62f5b
Change-Id: Ibf4de297e76cc0dc849d4f16ff1ae29b9ada950c
|
2017-02-03 01:24:53 +00:00 |
|
Jeff Sharkey
|
34df10ec98
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2
am: 5a50d2b12c
Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990
|
2017-02-03 01:24:20 +00:00 |
|
Jeff Sharkey
|
6529292783
|
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36
am: 806307106b
Change-Id: I0dca98d50cb5a1f835be0c9cd960d8ed15f16e7a
|
2017-02-03 01:23:52 +00:00 |
|
Jeff Sharkey
|
6cfa84791d
|
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263
am: 47bfa0ab25
Change-Id: I68ffb4a6973c8af213030ea441fbe2b93353fa9f
|
2017-02-03 01:23:23 +00:00 |
|
Jeff Sharkey
|
825a242ea9
|
DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
am: 30a4388481
Change-Id: I8b612304980150f522b0424e564f3bedf030c2b9
|
2017-02-03 01:22:53 +00:00 |
|
Jeff Sharkey
|
ce15555148
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29
am: 770eff87cd
Change-Id: I8aa0ade785b829b34490c3dbe80397fe7fb6bd3c
|
2017-02-03 01:22:20 +00:00 |
|
Suprabh Shukla
|
e12285ac47
|
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
am: cda0f97790 -s ours
Change-Id: Icb63044e32d8898cdb5624d38fef4de30b818978
|
2017-02-03 01:21:35 +00:00 |
|
Suprabh Shukla
|
b696cba781
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours
am: 58d9af0c77 -s ours
Change-Id: I23f74f1c1588800b2dbc4c33ef15ab457951b57d
|
2017-02-03 01:20:32 +00:00 |
|
Jack Yu
|
1350f9a1fe
|
resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
am: 5c6041843d
Change-Id: I7f0cd240b6054f57616e223f31d09a4152fe34e9
|
2017-02-03 01:19:39 +00:00 |
|
Jeff Sharkey
|
8c23d1aadb
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27
am: 8d9953964a
Change-Id: I85e2fcd6e4ab5d5183318db129ae17d5d2376005
|
2017-02-03 01:19:19 +00:00 |
|
Suprabh Shukla
|
20d2868f5c
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
am: 710a7e40dc
Change-Id: I4959ae33844b003b6c37325c5b572239cf5da47f
|
2017-02-03 01:19:09 +00:00 |
|
Suprabh Shukla
|
cb84f799ff
|
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd
Change-Id: I06acb1de8e89688e64b65f694cf29278a4cf7dde
|
2017-02-03 01:18:17 +00:00 |
|
Suprabh Shukla
|
7c6d80e66c
|
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b
am: 3411150115
Change-Id: Ie622523996134026550caa6af4c5a858aeb04a60
|
2017-02-03 01:17:18 +00:00 |
|
Jeff Sharkey
|
5a50d2b12c
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b
am: cecf30c3a2
Change-Id: I3737e39d6433792abcd4f78bbf19dc19596f582e
|
2017-02-03 01:15:15 +00:00 |
|
Jeff Sharkey
|
47bfa0ab25
|
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596
am: 6f47221263
Change-Id: I8736bfebc8038f24628387444bc656c103fcdf36
|
2017-02-03 01:14:17 +00:00 |
|
Jeff Sharkey
|
770eff87cd
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b
am: 7cd3c47c29
Change-Id: I91895a68c262cce27738b106c6f5d1b75a311b73
|
2017-02-03 01:13:24 +00:00 |
|
Jeff Sharkey
|
8d9953964a
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e
am: d2a9d6fa27
Change-Id: I206033dd081f2c7a04364815d8760261b87b435c
|
2017-02-03 01:12:38 +00:00 |
|
Jeff Sharkey
|
8b7b19144d
|
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 am: 1eb2ded281
am: badef8c88a
Change-Id: I4fe568d6b43e5a5c06aee6339f6fe4618865c2c6
|
2017-02-03 01:10:00 +00:00 |
|
Sergei Vasilinetc
|
16e211832e
|
Merge "Check if layer is created in detachSurfaceTexture"
|
2017-02-03 01:08:26 +00:00 |
|
Jeff Sharkey
|
cecf30c3a2
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours
am: 43f79eec8b
Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
|
2017-02-03 01:07:09 +00:00 |
|
Jeff Sharkey
|
6f47221263
|
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours
am: 65b0a6f596
Change-Id: Icf99c3f53e7281792db74ba5902ebf168bf07944
|
2017-02-03 01:06:20 +00:00 |
|
Jeff Sharkey
|
7cd3c47c29
|
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours
am: bafa3c1d3b
Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4
|
2017-02-03 01:05:28 +00:00 |
|
Jeff Sharkey
|
d2a9d6fa27
|
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours
am: cdb996355e
Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f
|
2017-02-03 01:04:24 +00:00 |
|