commit | 47ba346e1ea491f925ad47a4fa04b217bfcb4019 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Tue Feb 03 21:29:19 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 03 21:29:19 2015 +0000 |
tree | 8e9330998c1bc1a4189e76c19427f5026e7f1365 | |
parent | 2493118a3ca150bdb94d87dda17e7b3bd3940af7 [diff] | |
parent | 6317e06635ed52a9d1c1aeb0439017418f57ad0f [diff] |
Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06 * commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f': set tapjacking protection for deviceadmin permission dialog