| commit | 5fad8ffc975f3ccbf774b67f8238c03fc47723bd | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Mon Oct 16 22:29:16 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 16 22:29:16 2017 +0000 |
| tree | 3241eecd848b7914ff073f973c0f8c2602a69c75 | |
| parent | 670211346f31f34137ed059a69a51d824711c8b8 [diff] | |
| parent | ca3f39d30776c957f255f3db21ddc71cb0d5c3f8 [diff] |
Merge "Merge "DO NOT MERGE Added Tapjacking test for Device admin" into nougat-cts-dev am: c8746ca2d2 -s ours am: 86e18c90fe -s ours am: 27db7196c1 -s ours" into nyc-mr1-dev am: ca3f39d307 -s ours Change-Id: I142be17c33bd9e45027b55afe377a110533fd126