commit e96cf4aac568cb6547625b95ef8f3a421a13d52f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jan 23 18:20:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 18:20:10 2018 +0000
tree 6c5def4c1ff306d00ee80a8910d295895d4cedc8
parent eec1b6aa69b593f8f125d4619bc0740e1ea84124
parent 3ed62469970c809b75f05cffef75fe3ddd0df7cd

Merge changes from topic "am-4bdcb83abb6d48bdb4e0cf0cd49e3f13" into oc-dr1-dev

* changes:
  [automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b am: 2dc51bbb1d am: 1af3c204bf am: 4169eed161 am: 1a617677b0
  [automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b am: 2dc51bbb1d am: 1af3c204bf am: 4169eed161
  [automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b am: 2dc51bbb1d am: 1af3c204bf
  [automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b am: 2dc51bbb1d
  [automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b
  Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133