commit | 82302c140ac135f08f3ed3ef22e35053369f68da | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Thu Jul 20 21:40:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 21:40:48 2017 +0000 |
tree | a6375aea0ef15eaa507deb3c2ee36435418c44b7 | |
parent | f1363a54ef902a94dc907859dddeff64e4a97375 [diff] | |
parent | ed0fd97e225e49e3c1504708af46f8a14c0dc33c [diff] |
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours am: 54b51dc69a am: 09b926c699" into oc-dr1-dev-plus-aosp am: ed0fd97e22 Change-Id: I22a8b56351f506d2ed51395f3a2dd86aed6a2a7f