commit | 73244d7e6130eba270ef91805f903f7b9f909de9 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Wed Jul 19 22:24:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 22:24:11 2017 +0000 |
tree | 06cb431c40e0f36904d9cb9fb6174adfe0ecf3de | |
parent | 8f90b984dc7457363237524f744924a3ba72d747 [diff] | |
parent | 24153e89972fff6d008da5745a9a1f6be2b77c06 [diff] |
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours am: 25d1a95575 am: bb3979b057" into oc-dr1-dev-plus-aosp am: 24153e8997 Change-Id: I779c952c400b825381ea3a5c560000968af67c7d