summaryrefslogtreecommitdiffstats
path: root/drm/java/android/drm/DrmManagerClient.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-08-22 14:14:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-22 14:14:54 -0700
commitb9b56954ec5a242f7c4945942539106539f98ffb (patch)
tree8a65b45600e476175401783557b880f2bee9d130 /drm/java/android/drm/DrmManagerClient.java
parent6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560 (diff)
parent259328c04ce16c554b48a14f68d8af94dc54d7ec (diff)
downloadframeworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.zip
frameworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.tar.gz
frameworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.tar.bz2
Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
Diffstat (limited to 'drm/java/android/drm/DrmManagerClient.java')
0 files changed, 0 insertions, 0 deletions