| commit | 29c99f1534ed5b3638a047b0651fa0d10f2c3c35 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Feb 03 21:31:56 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 03 21:31:56 2015 +0000 |
| tree | c28571c1fc829ac801e53256d152363c09580244 | |
| parent | 907990dbc575f2eb2a4ab68edf11843cbac66017 [diff] | |
| parent | 47ba346e1ea491f925ad47a4fa04b217bfcb4019 [diff] |
Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06 automerge: 47ba346 * commit '47ba346e1ea491f925ad47a4fa04b217bfcb4019': set tapjacking protection for deviceadmin permission dialog