commit | 49f4c0055e804d2ceecc770eee3b9d77a993d41c | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:44:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:44:06 2017 +0000 |
tree | c397c6f0d018a564e20e71dd90aed8e360a4cd8f | |
parent | 4319c6dda3c4232bb72422bafd98309f018f7fee [diff] | |
parent | 13f423f0e13dba88ca7823e2e9d8e3f777bce116 [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 am: 0ac3704512 -s ours am: 0c1c0aa4b5 -s ours am: e19a6c202f -s ours am: 13f423f0e1 -s ours Change-Id: I069bf6c0cf16514f398e1c1792df3430791381dd