commit | c49e4d83d996c08e4888bee8b01402f11182951f | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:42:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:42:28 2017 +0000 |
tree | fe8abcc1b305e87589da79765e394b795095dff0 | |
parent | ca2005b941fe831d98f5a0af06ceba9dda4c1803 [diff] | |
parent | bc75037395abfc821021cefac3c2083466948184 [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 am: bc75037395 -s ours Change-Id: I74f687d7996be06f34c7d989084c684929858db0