commit | 93afe3cc57d1e829c1c1bb57d4cb99b0e43940d4 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:46:02 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:46:02 2017 +0000 |
tree | 57bfb75347027b7e07496984e1d72b8dfa9a59f9 | |
parent | 106abbe55610c25105131b2feb0b01fb09a138f5 [diff] | |
parent | ca2005b941fe831d98f5a0af06ceba9dda4c1803 [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 am: 0987d99c90 am: 0edfdf927d am: d500b048aa -s ours am: ca2005b941 Change-Id: I2e5dddce62fe1ab30787808bb5c0446a60f5399a