Adam Seaton
|
4149340d7c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours
am: a94af85a7d -s ours
Change-Id: I73ca7a9fd67ec1c870675ba4416d650bb0586c23
|
2017-07-19 22:44:17 +00:00 |
|
Colin Cross
|
4d69df5191
|
Merge "Revert "Use java prebuilts""
|
2017-07-19 22:44:12 +00:00 |
|
Colin Cross
|
02112900cc
|
Revert "Use java prebuilts"
This reverts commit 1931750940.
Change-Id: I7a99fd6c53d35a2a674f2d60b113a727f3c453ce
|
2017-07-19 22:42:46 +00:00 |
|
Adam Seaton
|
6ac9ecd397
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f
am: c7040501a1 -s ours
Change-Id: Id2d6b7359c54f2a990e4fb8bb4041f1637423092
|
2017-07-19 22:41:18 +00:00 |
|
Adam Seaton
|
a94af85a7d
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours
am: df338dadee -s ours
Change-Id: I73cd2a110a0c0957f7c0c9ea47ff8a6c730d8900
|
2017-07-19 22:41:17 +00:00 |
|
Adam Seaton
|
c7040501a1
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c
am: dbecffb85f
Change-Id: Iee83fa15644388db9720b17b83ee744130ab77c1
|
2017-07-19 22:38:20 +00:00 |
|
Adam Seaton
|
df338dadee
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours
am: 50efec7a2c -s ours
Change-Id: I6d763102767cbaebf6ebb25d5be76e8bbec662b7
|
2017-07-19 22:38:17 +00:00 |
|
Adam Seaton
|
dbecffb85f
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded
am: 29c817a61c
Change-Id: Ia8c1dfaf4c3d82ed6f2d8b1a63be036d29f41285
|
2017-07-19 22:35:20 +00:00 |
|
Adam Seaton
|
50efec7a2c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded
am: 29c817a61c -s ours
Change-Id: I287e92310afc3ef1d505b2ee175e0cd1a4071c8a
|
2017-07-19 22:35:17 +00:00 |
|
Adam Seaton
|
29c817a61c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65
am: 8f46ad2ded
Change-Id: I80f9a4d498b578b608b6bf44f2cfb18a683569d8
|
2017-07-19 22:32:48 +00:00 |
|
Adam Seaton
|
8f46ad2ded
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours
am: aec34cff65
Change-Id: I2b2716a37e3df0601714d56af89acc6578fc6cf7
|
2017-07-19 22:29:49 +00:00 |
|
Android Build Merger (Role)
|
85e6742c90
|
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours am: b4682b1f42 am: 2f9c66b727" into oc-dr1-dev-plus-aosp
|
2017-07-19 22:26:34 +00:00 |
|
Adam Seaton
|
dd03d9898b
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours am: b4682b1f42
am: 2f9c66b727
Change-Id: Iada9e3a3d55db4b7ba1029bc06cf3f2237487591
|
2017-07-19 22:26:20 +00:00 |
|
Adam Seaton
|
7da19aa0db
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours am: b4682b1f42
am: 9f454d2c1e
Change-Id: I3bd56c73dac62c5088d3029ad3b4b4cd92ccc8e7
|
2017-07-19 22:26:19 +00:00 |
|
Adam Seaton
|
aec34cff65
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33
am: f01d7163e8 -s ours
Change-Id: I79a827a4da9f2822a1abe972c20f243fee1768db
|
2017-07-19 22:26:18 +00:00 |
|
Adam Seaton
|
f01d7163e8
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9
am: 35f0f8df33
Change-Id: Id933801acd73721eeb734ede7d7e766927d361f2
|
2017-07-19 22:23:47 +00:00 |
|
Adam Seaton
|
9f454d2c1e
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours
am: b4682b1f42
Change-Id: Ie710ef4c6006c8dd6402d3dc47f2b72da8f143f0
|
2017-07-19 22:23:47 +00:00 |
|
Adam Seaton
|
2f9c66b727
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours
am: b4682b1f42
Change-Id: I9996ad2ebcbe1ca58a14bad9530874a4c5c7d174
|
2017-07-19 22:23:46 +00:00 |
|
Adam Seaton
|
35f0f8df33
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf
am: d3789031c9
Change-Id: I27d36cb130edbdc8e98ec59a19192f6d111efb1e
|
2017-07-19 22:20:47 +00:00 |
|
Adam Seaton
|
b4682b1f42
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours
am: bac9a62680 -s ours
Change-Id: Ib3f24756d379c95db5051491104e8f69ece1fc64
|
2017-07-19 22:20:45 +00:00 |
|
Android Build Merger (Role)
|
d2d0e31200
|
Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
|
2017-07-19 22:19:50 +00:00 |
|
Colin Cross
|
1a05e52e6d
|
Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
am: 7b38914e4e
Change-Id: I61313e8009c964868cf4984a7f86811748e98819
|
2017-07-19 22:19:03 +00:00 |
|
Android Build Merger (Role)
|
24153e8997
|
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours am: 25d1a95575 am: bb3979b057" into oc-dr1-dev-plus-aosp
|
2017-07-19 22:18:49 +00:00 |
|
Adam Seaton
|
d3789031c9
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours
am: 451a9d73bf
Change-Id: Id8b2531e63cdf9a8c21249d313abda258c014363
|
2017-07-19 22:18:21 +00:00 |
|
Adam Seaton
|
677155046f
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours am: 25d1a95575
am: bb3979b057
Change-Id: I5d34e3ea3f1e5bd4618fd5dd0dafdb74d7fd9fc8
|
2017-07-19 22:18:21 +00:00 |
|
Adam Seaton
|
c3fa1fb49c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours am: 25d1a95575
am: 291bcf837c
Change-Id: I962ea25f056915e46d44686015100efb77d1dab5
|
2017-07-19 22:18:21 +00:00 |
|
Adam Seaton
|
bac9a62680
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours
am: 690b7e9091 -s ours
Change-Id: Iba622d08140b22ebdc0ec278b2b518bde15293bd
|
2017-07-19 22:18:15 +00:00 |
|
Android Build Merger (Role)
|
7b38914e4e
|
Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
|
2017-07-19 22:16:37 +00:00 |
|
Colin Cross
|
7d7f4cd7bb
|
Merge "Use java prebuilts" am: 26e1b6d6c2
am: fcbaa25380
Change-Id: I27e44fa8d649092327b3543f440fae65b36c054c
|
2017-07-19 22:16:07 +00:00 |
|
Adam Seaton
|
bb3979b057
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours
am: 25d1a95575
Change-Id: Iefd799bc1d3e92813911be55739041326dc733b9
|
2017-07-19 22:15:47 +00:00 |
|
Adam Seaton
|
451a9d73bf
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8
am: 214aeaefef -s ours
Change-Id: I5d5c9b3d264e66de20d5674f00eba3b2f4d23a3b
|
2017-07-19 22:15:45 +00:00 |
|
Adam Seaton
|
690b7e9091
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours
am: 9c8b857af3 -s ours
Change-Id: I8c3067322ac8218a69827af2b2c258da28c123f9
|
2017-07-19 22:15:45 +00:00 |
|
Adam Seaton
|
291bcf837c
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours
am: 25d1a95575
Change-Id: I8e534bdf4bad6b5f1071cccfe5543bd9e4ec95a5
|
2017-07-19 22:15:45 +00:00 |
|
Colin Cross
|
fcbaa25380
|
Merge "Use java prebuilts"
am: 26e1b6d6c2
Change-Id: If761856f9fd509d2c5694844b6bb10966717e0b1
|
2017-07-19 22:13:09 +00:00 |
|
Adam Seaton
|
214aeaefef
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours
am: c0d2cfb8b8
Change-Id: I1515e978afcc639ea122253d2ac8a310a3567db2
|
2017-07-19 22:12:45 +00:00 |
|
Adam Seaton
|
25d1a95575
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d
am: 1500ea69de -s ours
Change-Id: I266adfc2fb6fefb0353cb3b7017f56729a14774f
|
2017-07-19 22:12:44 +00:00 |
|
Adam Seaton
|
1500ea69de
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3
am: e02f8e490d
Change-Id: If11d5e19433907b331ae5a23c11d8a02454b3384
|
2017-07-19 22:10:15 +00:00 |
|
Adam Seaton
|
9c8b857af3
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours
am: 6004c810a0 -s ours
Change-Id: I1e6c08edeca3522c57805bdd54946152951f573d
|
2017-07-19 22:10:14 +00:00 |
|
Adam Seaton
|
c0d2cfb8b8
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev
am: 788d85f5ae -s ours
Change-Id: I8510debe7207a44a46892ce9e392c9a7f125b98f
|
2017-07-19 22:10:14 +00:00 |
|
Colin Cross
|
26e1b6d6c2
|
Merge "Use java prebuilts"
|
2017-07-19 22:08:48 +00:00 |
|
Adam Seaton
|
e02f8e490d
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930
am: 6e74bc34e3
Change-Id: I7e7342b3bfcef3018994a559814e341fb9f1a741
|
2017-07-19 22:07:45 +00:00 |
|
Adam Seaton
|
6004c810a0
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930
am: 6e74bc34e3 -s ours
Change-Id: I5d7a7d9ae030bdd37165a2586612daa2e4a06224
|
2017-07-19 22:07:44 +00:00 |
|
Adam Seaton
|
6e74bc34e3
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac
am: 6703815930
Change-Id: I19e49cbd840eceda215ba519cbb6a938947ffcb1
|
2017-07-19 22:04:45 +00:00 |
|
Adam Seaton
|
6703815930
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev
am: 89aa0d18ac
Change-Id: I585ee47ae511338feacf47f32fe6a4c42b2d52d1
|
2017-07-19 22:02:15 +00:00 |
|
TreeHugger Robot
|
788d85f5ae
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev
|
2017-07-19 22:00:58 +00:00 |
|
TreeHugger Robot
|
89aa0d18ac
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev
|
2017-07-19 21:56:24 +00:00 |
|
Android Build Merger (Role)
|
a091d39ee6
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe am: e29d61d582 am: 775c752f51 -s ours am: 6399f470f6 -s ours am: 4a126acfa7 am: 4c9adca135 -s ours am: b8d42f935a am: effbf4f539 am: 131dfae90d am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours am: 4ebd91e5c5 -s ours am: 763bc1f8a1 -s ours am: ec600cb0ec am: 79cac27a7d" into oc-dr1-dev-plus-aosp
|
2017-07-19 21:34:36 +00:00 |
|
Adam Seaton
|
d4b25c7a42
|
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe am: e29d61d582 am: 775c752f51 -s ours am: 6399f470f6 -s ours am: 4a126acfa7 am: 4c9adca135 -s ours am: b8d42f935a am: effbf4f539 am: 131dfae90d am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours am: 4ebd91e5c5 -s ours am: 763bc1f8a1 -s ours am: ec600cb0ec
am: 79cac27a7d
Change-Id: Iff1c0046f37bc6b56ab75c0850bf2e4e50216ac1
|
2017-07-19 21:34:16 +00:00 |
|
Adam Seaton
|
a99c1d5bd9
|
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe am: e29d61d582 am: 775c752f51 -s ours am: 6399f470f6 -s ours am: 4a126acfa7 am: 4c9adca135 -s ours am: b8d42f935a am: effbf4f539 am: 131dfae90d am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours am: 4ebd91e5c5 -s ours am: 763bc1f8a1 -s ours am: ec600cb0ec
am: 896b67bb5b
Change-Id: I615820e174d8955ecbad052f55cd6b1bf3ecb1b6
|
2017-07-19 21:34:15 +00:00 |
|
Adam Seaton
|
896b67bb5b
|
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe am: e29d61d582 am: 775c752f51 -s ours am: 6399f470f6 -s ours am: 4a126acfa7 am: 4c9adca135 -s ours am: b8d42f935a am: effbf4f539 am: 131dfae90d am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours am: 4ebd91e5c5 -s ours am: 763bc1f8a1 -s ours
am: ec600cb0ec
Change-Id: I7c80cbe84dce507a791e70591c69688b9134d8e3
|
2017-07-19 21:31:15 +00:00 |