tree 38b6e4695e28e5a156a551d1616d84d4c3c0c4b9
parent b7f60ad9aae35d0680896d6e6b03457da70d0838
parent e940ed5ba1091ef744d4f8ff7f49b40c61ed478b
author android-build-team Robot <android-build-team-robot@google.com> 1525383867 -0700
committer android-build-merger <android-build-merger@google.com> 1525383867 -0700

Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686" into oc-dev am: 7552ad0aa7
am: e940ed5ba1

Change-Id: Idd6057955a2fb457ed0f68731513875125828af4