| commit | 3b7bfd7ed63e0834560ff96f59a646bc8079d9c1 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Fri May 19 19:46:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:46:28 2017 +0000 |
| tree | fe8abcc1b305e87589da79765e394b795095dff0 | |
| parent | a7a5c77fc6b58fbf5bc19192303cd07322cc7d59 [diff] | |
| parent | ca020917a2d84497fac8a4bed5496f03afdf7c95 [diff] |
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours am: 588a0f8523 -s ours am: 5311ff5db5 -s ours am: 674c03c38f -s ours am: 521f5df845 -s ours am: ca020917a2 Change-Id: Ideb618b8cd2abc7d07bdc033349671caab3d1558