commit | 954480ad3aa301268b5c0a858a9b32c1eca46a4e | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Thu Jul 20 21:51:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 21:51:34 2017 +0000 |
tree | 9249fd4f4456f2e52e70ef83c5f679a38fe09b8e | |
parent | f09831738120f623739cc5cd8914a86ec02abb9b [diff] | |
parent | 430a432169bb789e072faa13ed8b283d3bda440b [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: 02e95f72ed am: 2e66fbc652" into oc-mr1-dev-plus-aosp am: 430a432169 -s ours Change-Id: I2f3b7f41fe960080a2efeeadfe0e645eed0c7bff