commit | 7884b87fb6eccef2ac412809da61c0eede6aeea8 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Thu Apr 13 17:00:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 17:00:50 2017 +0000 |
tree | 28a9e6e458ce9057194ca4a721af960cb15f638d | |
parent | 6b9ed90192f984a309870e39740a3b66c264d0c5 [diff] | |
parent | 910f5a1c4013e537fe24be6641245b118bd0fa9a [diff] |
Merge "Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev am: 43e940a082 am: 8b0e642413 am: 5e77ff481b am: 536c5864e9 am: e8b915f3fe am: d513a4bfb7 am: a242a1a703 am: cf95930426 am: 5ec8bedc27 -s ours am: 4ca3a503fb" into oc-dev-plus-aosp am: 910f5a1c40 Change-Id: Ic0376f203f026dd489682beb220e10b4217e8489