commit | 0ac3704512dfce51200f26d3b5713c024b1ceb54 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:35:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:35:05 2017 +0000 |
tree | 221ae68bf87a9c30208e7667f5b763bf9c0380a1 | |
parent | ff461ef52c421e9ccf4ec10016c648a22fe9b50a [diff] | |
parent | 75864440c3461b9895c75c1322a5da786c6a6b1f [diff] |
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours Change-Id: I358507c9526f70125bf28b5af87f9bfaa9e867fa