commit | d500b048aab400d90c16fb69cd6e4de248f35049 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:40:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:40:41 2017 +0000 |
tree | 877d4e1aecd84a4cb7657645f5da9e33502a4d21 | |
parent | 4a431f6cd7e2c7ad9c86d2af077f6a78495705ee [diff] | |
parent | 0edfdf927d07647d7bed950dfead36fc280c5a5f [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 Change-Id: Icd0c0b489d72515477ff320ae83864d6b07ab186