| commit | 5311ff5db5462b565e2f056f87e88313fe13078a | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:37:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:37:00 2017 +0000 |
| tree | 221ae68bf87a9c30208e7667f5b763bf9c0380a1 | |
| parent | 0c1c0aa4b595e83546b4535760a531359c8dc1b3 [diff] | |
| parent | 588a0f8523aa131d2afff99c3cc566b7f1568f87 [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 -s ours am: 588a0f8523 -s ours Change-Id: I28d0bb37c2c119dfed044acc09d1660f6c6260a7