Commit Graph

37952 Commits

Author SHA1 Message Date
Adam Seaton feb090c1b8 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 am: 4149340d7c -s ours
am: b81e890ef9

Change-Id: I76868c7ef97d25b99c713b4f95122d43e94f15ba
2017-07-19 22:49:52 +00:00
Adam Seaton b81e890ef9 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
am: 4149340d7c  -s ours

Change-Id: Iae950b38f0d5ae4870019e4586f42ce81dc33714
2017-07-19 22:47:19 +00:00
Adam Seaton 05eed82d81 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
am: 6ac9ecd397

Change-Id: Ifa3d8036c7b8a8c3165043875e806774713b3039
2017-07-19 22:44:19 +00:00
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
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
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 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
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 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 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 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
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 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 ec600cb0ec [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

Change-Id: If2185478612f01d84f945149bab47239afd25dcc
2017-07-19 21:27:13 +00:00
Adam Seaton 8c05dcc0b9 [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

Change-Id: Ica71e9890380af14c83e86e4c97d0b47513a8d77
2017-07-19 21:25:28 +00:00
Adam Seaton 425f796fee [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

Change-Id: Ia3066af8ce6cc9fb8615858e5d7833b460562299
2017-07-19 21:24:44 +00:00
Adam Seaton 763bc1f8a1 [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

Change-Id: Ieb0a3bcbd31467d46bc1218e64a23da4cb0eabee
2017-07-19 21:24:42 +00:00
Adam Seaton 7e96035bb8 [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

Change-Id: I5da55f5d6ea75ac03ccd859abdf485fbeb629df4
2017-07-19 21:24:42 +00:00
Adam Seaton 4ebd91e5c5 [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

Change-Id: Icc4f273490a6878f6d407adf88eab459ce64b6b2
2017-07-19 21:21:42 +00:00
Adam Seaton 1419ef609f [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

Change-Id: I57ccd18f406c70e1f2539293a21cab1edbb5fa80
2017-07-19 21:21:41 +00:00
Adam Seaton 63c4991b50 [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

Change-Id: Ibcc0ec2b7cbd5694639f20f94f35fb3661ebd176
2017-07-19 21:21:41 +00:00
Adam Seaton 87c38ba25e [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

Change-Id: I4440fdb0a8262eed8d7ff0efad94c259b9aa9682
2017-07-19 21:21:41 +00:00
Adam Seaton e2e583de4a [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

Change-Id: I54e409432012bff976e81dcceefba395b40a4bad
2017-07-19 21:18:44 +00:00
Adam Seaton 24594261ce [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

Change-Id: Icd1e1e072a1a0ed6b7f4bda6a8501ad563893fa6
2017-07-19 21:18:42 +00:00
Adam Seaton b3e05e6d23 [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

Change-Id: I430c55ddb7b5a7b6f8f94a2b55ef19a2b1b535db
2017-07-19 21:18:42 +00:00