tree a8fe4faf236587b60d57079f2f166bc314bc7072
parent 54d3d82d20ec45f71c372f8cdcc8f7a1da7bb149
parent 908ec15ec1655b0511977e1ba19959c53a27cb82
author Adam Seaton <aseaton@google.com> 1492109788 +0000
committer android-build-merger <android-build-merger@google.com> 1492109788 +0000

Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f  -s ours am: dc966b8c77 am: ffcc117ff1 am: 5e927ef761
am: 908ec15ec1  -s ours

Change-Id: Idcd2d3e91d07d79d6728694ce7f849cd98032191