| commit | e41f6732e57fdc1ea7b5a518c5759aa53a17b9b3 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Jul 20 21:51:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 21:51:52 2017 +0000 |
| tree | 9249fd4f4456f2e52e70ef83c5f679a38fe09b8e | |
| parent | 954480ad3aa301268b5c0a858a9b32c1eca46a4e [diff] | |
| parent | f2ab2ff15d84c52a9ef8aa461a09599b868b9e7b [diff] |
Merge "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" into oc-mr1-dev-plus-aosp am: f2ab2ff15d -s ours Change-Id: Ie99d95376fdeb7508e929160b5ea82f190f02849