tree f297fb78f78ddd5b7d8aea5ddc840b942d80d6e8
parent 975180409ed9aa29c0e52cb821fdf1edfe08d49c
parent 4bef242844c52f68747f7a98f3999654bf94d82b
author Android Merger <android-build-merger@google.com> 1508185545 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1508185545 +0000

Merge changes from topic "am-5a233c15a51e4339b1fc09a03ec4f70c"

* changes:
  Merge changes from topic "am-0662898ddedc463d805b6178203f08df" into oreo-cts-dev am: 13c178dcf3
  DO NOT MERGE Added Tapjacking test for Device admin am: 392e9e6807  -s ours am: 29be9941cb  -s ours am: 72890eb2fb  -s ours am: fb9da20c89  -s ours