tree d088ca6914fb6b4bc3723397ac0313052ff7c480
parent 8b53914dfb7bc551d99dbc760fab61effd76166c
parent a46958d60774753c37b0ce3d2348890f205e1e23
author Android Merger <noreply-android-build-merger@google.com> 1515471283 +0000
committer android-build-merger <android-build-merger@google.com> 1515471283 +0000

Merge "Merge "STS test for Android Security b/32219453" into oc-dev am: 48376c587c am: 117438c527 am: e958f7ca9a" am: 404ee71139 am: 1850c71c4a
am: a46958d607

Change-Id: I13250fc76a68080ca009676420838815c052c616