summaryrefslogtreecommitdiffstats
path: root/core/java/android/print/PrintDocumentInfo.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-09-27 00:46:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-27 00:46:53 +0000
commit231bd6c514f15cb0b42a04d4fc7fc9631c743686 (patch)
tree7f23b5cbf92a5f64ca441bd0f360aa5a579b7b6f /core/java/android/print/PrintDocumentInfo.java
parent8fb6d97ad5671b4abc1940d8bc56cf7448e45c35 (diff)
parent0756632aa056cc873943f7f19c7501ce79608394 (diff)
downloadframeworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.zip
frameworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.tar.gz
frameworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.tar.bz2
Merge "Dismiss keyguard when resuming visible activities" into klp-dev
Diffstat (limited to 'core/java/android/print/PrintDocumentInfo.java')
0 files changed, 0 insertions, 0 deletions