| commit | e19a6c202fa248bf60fd9fff2e7ea800fb748e07 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:38:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:38:36 2017 +0000 |
| tree | 401abf392b2073bf982e85c616cfb4f787254a45 | |
| parent | 1ffe37a8d380df44271aaeafb8233646abf86b68 [diff] | |
| parent | 0c1c0aa4b595e83546b4535760a531359c8dc1b3 [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 Change-Id: I12653416d280df8ab8da8e1684d9113d6c0c51bb