tree 39548272fdbc2c24618ce70e3ec5cd4084468b19
parent 860c50890f079467a9216c0a5dd346d65158953f
parent 43e940a0826b821886b9763148c6afc0d6b35e20
author Adam Seaton <aseaton@google.com> 1492043253 +0000
committer android-build-merger <android-build-merger@google.com> 1492043253 +0000

Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev
am: 43e940a082

Change-Id: Ia905d5e0d29a32d013a0a0d54f48bfb2a4934792