tree 136e0866a150425ce206e5ef362430efa3360746
parent f71ed71df88e0901daf5e404c2924d78bae63995
parent 84a63f1c0c70d3a82ed544c82c3cfe3ec9a248cf
author Andres Celis <celisa@google.com> 1502304405 +0000
committer android-build-merger <android-build-merger@google.com> 1502304405 +0000

Merge "CTS/STS test for Android Security b/25818142" into mnc-dev am: 2d75fbfc55 am: fee8bcfeb9 am: 619d1a6457 am: 1a3ac1393d
am: 84a63f1c0c

Change-Id: Ia349103207615ea6666de2a81b271b86de3af9cf