commit | be8dc7186069359bcefeb03f7d76c737514f035d | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Fri May 26 01:30:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 26 01:30:28 2017 +0000 |
tree | 529b68d4a62fe0b11080232ca3c18afbbd9d736f | |
parent | 34aea640f87427f6199bf64d795490ddea4a533a [diff] | |
parent | a7084f1415b148f3ed1641374f2932054eab63f4 [diff] |
Merge "Revert "Added Tapjacking test for Device admin"" into oc-dev am: e2a1a9e5d9 am: a7084f1415 Change-Id: I68afb3ccf61fbcd4530439bc2a1bd2c683618625