| commit | 974d64ee8f006998649795c93c9b017d2ca83a85 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:33:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:33:25 2017 +0000 |
| tree | 2e61638bcc33f479ccda265ad1afbf81f40eeb6a | |
| parent | 75864440c3461b9895c75c1322a5da786c6a6b1f [diff] | |
| parent | 70accb9b435df3258841b43a274b71ec3e954c8b [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 am: 70accb9b43 Change-Id: I62e008a1e018893cb5ddf7201d92343f67942912