| commit | 2b0394ba3d5a33553190697f293de58ea140071b | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:47:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:47:13 2017 +0000 |
| tree | 57bfb75347027b7e07496984e1d72b8dfa9a59f9 | |
| parent | 3ac0e4b3a515cf7f426500e2619332aa37ce4eb1 [diff] | |
| parent | 32687ae8301503be6b464e170b848620d8b97719 [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 am: 974d64ee8f am: 8b0ad111c3 am: dc36b5a2a9 -s ours am: 4319c6dda3 am: 32687ae830 Change-Id: I413347818df532809adb35c98e9860076b85c227