commit | 588a0f8523aa131d2afff99c3cc566b7f1568f87 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:35:26 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:35:26 2017 +0000 |
tree | 221ae68bf87a9c30208e7667f5b763bf9c0380a1 | |
parent | 0ac3704512dfce51200f26d3b5713c024b1ceb54 [diff] | |
parent | 974d64ee8f006998649795c93c9b017d2ca83a85 [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 Change-Id: I448dd5be384ecd58e8a3ceb05d1c9c1a5713b53f