commit | 70accb9b435df3258841b43a274b71ec3e954c8b | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:31:29 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:31:29 2017 +0000 |
tree | f32d2bb2df228954c48594615aa8b8942045dda4 | |
parent | 701dc24fb9989b6d1a8f7a63fcbba17a457670fb [diff] | |
parent | 6a94730d20cbd648e14e4efff7547b787e0661b9 [diff] |
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 Change-Id: I505e20e71ccc2fc4f594300b3b94c45fb1e5c8a2