commit | 701dc24fb9989b6d1a8f7a63fcbba17a457670fb | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:31:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:31:06 2017 +0000 |
tree | f32d2bb2df228954c48594615aa8b8942045dda4 | |
parent | 7b94aecada053d9440e488c647063f3bd04bf483 [diff] | |
parent | 288fd15d69f13527d7de309696963d169106dfdc [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 Change-Id: I5dc3408114f58145810c33111b15d4d40e7a3835