Commit Graph

38497 Commits

Author SHA1 Message Date
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
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
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
Colin Cross
fcbaa25380 Merge "Use java prebuilts"
am: 26e1b6d6c2

Change-Id: If761856f9fd509d2c5694844b6bb10966717e0b1
2017-07-19 22:13:09 +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
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
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
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
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
Android Build Merger (Role)
1a3ba8ef18 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 2017-07-19 21:27:51 +00:00
Android Build Merger (Role)
2820b0a614 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 2017-07-19 21:27:49 +00:00
Adam Seaton
90ce28deb8 [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

Change-Id: I753a3c6bda6d8f1c811b31fff6d2010250255ecf
2017-07-19 21:27:40 +00:00
Adam Seaton
afda894733 [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

Change-Id: I22a5c06defe19a19499a62074b34f02bd7887841
2017-07-19 21:27:37 +00:00
Android Build Merger (Role)
c3b8e4745e 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 2017-07-19 21:27:35 +00:00
Adam Seaton
90934de321 [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

Change-Id: I99fc3127a68f863cdeb70ab07ac572f49b1bc212
2017-07-19 21:27:15 +00:00
Adam Seaton
f4223790f1 [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

Change-Id: Ib408f5640184e4b6104bd5e9a44da04e23637be2
2017-07-19 21:27: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
28b0d9cfe6 [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: I63eb1b780654b676b1632cbf1f9abc29569fb2b0
2017-07-19 21:25:29 +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
317880cb61 [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

Change-Id: Iad971e2ace42abd3e46ad1007b1f8ec71d49fc37
2017-07-19 21:25:19 +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
f3824973a6 [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: Ida651941d0156acefadd6800115d607583976052
2017-07-19 21:24:44 +00:00
Adam Seaton
646b6fdf0b [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

Change-Id: I71804e3efcf40d357fb2809328fed8babe3b0608
2017-07-19 21:24:43 +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
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
9be9e54195 [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: Ib8cf37071a15d5080044df2d5c0dc51a0bd8f56d
2017-07-19 21:21: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
d3f3583872 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 am: 08425ba495
am: 5aaced88b8  -s ours

Change-Id: I60f2772a3c751a6c4bc5fd352ede97bf1b77445b
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
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
f405e6fa54 [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

Change-Id: I7d429cb68e4076c312fb2f8f4e61f3f2b48f5023
2017-07-19 21:15:43 +00:00
Adam Seaton
5aaced88b8 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53
am: 08425ba495

Change-Id: I0784c9350d75cfd341e38415707bbf6276f09555
2017-07-19 21:15:41 +00:00
Adam Seaton
3630da3bdd [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

Change-Id: Id32add2c8c54747e22e8ef96d3484fc1bd91ed61
2017-07-19 21:15:41 +00:00
Adam Seaton
3bf3f53e5e [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 -s ours
am: 1447fa794a  -s ours

Change-Id: Iee80135e5f9577cb8dd45ba11e7eff0a4f886e11
2017-07-19 21:15:40 +00:00
Adam Seaton
ab1c4fb3c4 [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

Change-Id: I766d9e551e81801f4293af24f11b4da3a2802120
2017-07-19 21:13:16 +00:00
Adam Seaton
08425ba495 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5
am: 73c3609c53

Change-Id: I9319957d255084424c82fa759521285786b6a852
2017-07-19 21:13:11 +00:00
Adam Seaton
1447fa794a [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5
am: 73c3609c53  -s ours

Change-Id: I0a2c0db6add00718249fc09ed448df50d5a2190d
2017-07-19 21:13:10 +00:00