Commit graph

38811 commits

Author SHA1 Message Date
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
Colin Cross
0141bf4008 Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
am: d2d0e31200

Change-Id: Iea40d864193eead68603aac150a5e02d0060728d
2017-07-19 22:24:35 +00:00
Adam Seaton
73244d7e61 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
am: 24153e8997

Change-Id: I779c952c400b825381ea3a5c560000968af67c7d
2017-07-19 22:24:11 +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
8f90b984dc 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
am: c3fa1fb49c

Change-Id: I6b9f7ae5dad78cae871e82581dbd014d93f60079
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
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
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
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
Adam Seaton
56ba4531f4 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
am: a091d39ee6

Change-Id: Ia1a19c2b19353aadc349c972a95fd26efbbb1c14
2017-07-19 21:37:42 +00:00
Adam Seaton
e1ddcf3f8c [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
am: a99c1d5bd9

Change-Id: Ibf56a6382e80fd9529bbc66d487a85fe44e261fa
2017-07-19 21:37:17 +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
a45c2c9ca9 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 -s ours am: 1447fa794a -s ours am: 3bf3f53e5e -s ours am: b3e05e6d23 -s ours am: 87c38ba25e -s ours am: 7e96035bb8 am: 8c05dcc0b9" into oc-dr1-dev-plus-aosp
am: 1a3ba8ef18

Change-Id: I1aacb15be7da697228bb94cb42682176b37b8b79
2017-07-19 21:32:16 +00:00
Adam Seaton
98aae24581 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 -s ours am: 1447fa794a -s ours am: 3bf3f53e5e -s ours am: b3e05e6d23 -s ours am: 87c38ba25e -s ours am: 7e96035bb8 am: 28b0d9cfe6" into oc-dr1-dev-plus-aosp
am: 2820b0a614

Change-Id: I2f44db42ff1acfbd6afbbcedc38d3aadbb07b29f
2017-07-19 21:31:57 +00:00
Adam Seaton
6cd1603bd5 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 am: f405e6fa54 am: e2e583de4a -s ours am: 63c4991b50 am: 425f796fee" into oc-dr1-dev-plus-aosp
am: c3b8e4745e

Change-Id: I07f35e329a690ef0e39e8fa97b4118f5a7c69ead
2017-07-19 21:31:38 +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
Adam Seaton
79cac27a7d [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: I140f733f6faceb4c40c8473d7e2fa6acc30d2b07
2017-07-19 21:31:15 +00:00
Adam Seaton
7255ed18f4 [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 am: f405e6fa54 am: e2e583de4a -s ours am: 63c4991b50 am: f3824973a6
am: f4223790f1

Change-Id: I1b8e526c00f31cf5f4e6c47598a38c3718d90913
2017-07-19 21:31:14 +00:00
Adam Seaton
ac799a1767 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 am: 08425ba495 am: 5aaced88b8 -s ours am: d3f3583872 am: 1419ef609f
am: 317880cb61

Change-Id: Ib10c672720221ed8e913275ea87a7c6602fd586a
2017-07-19 21:28:23 +00:00
Adam Seaton
45c7fe6a99 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 am: 08425ba495 am: 5aaced88b8 -s ours am: d3f3583872 am: 9be9e54195
am: 646b6fdf0b

Change-Id: Ia8259edc9c729a9432924c7f082500ae1b060e1e
2017-07-19 21:28:06 +00:00