| commit | e923f7bc50824337cbe5c4c0c55b70f4aadc1a5f | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:49:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:49:39 2017 +0000 |
| tree | 57bfb75347027b7e07496984e1d72b8dfa9a59f9 | |
| parent | 2b0394ba3d5a33553190697f293de58ea140071b [diff] | |
| parent | a7a5c77fc6b58fbf5bc19192303cd07322cc7d59 [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 am: a7a5c77fc6 Change-Id: Id919b3b148ebf99d85ab510a62d58a33900f713e