| commit | f283419a6cb58d9cbe69ce77bce9d8f1347631ab | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:40:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:40:37 2017 +0000 |
| tree | c397c6f0d018a564e20e71dd90aed8e360a4cd8f | |
| parent | 2af63a840283a6a98ee5564c936c49b5f8708097 [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 -s ours Change-Id: I042d8d8d1ea534a122924a96cf9c0867e82dc002