| commit | a7a5c77fc6b58fbf5bc19192303cd07322cc7d59 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:46:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:46:09 2017 +0000 |
| tree | fe8abcc1b305e87589da79765e394b795095dff0 | |
| parent | 32687ae8301503be6b464e170b848620d8b97719 [diff] | |
| parent | 49f4c0055e804d2ceecc770eee3b9d77a993d41c [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 am: e19a6c202f -s ours am: 13f423f0e1 -s ours am: 49f4c0055e Change-Id: I98933a6186e3bb990d68ea0d9263cce6a1b502d0