summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler/res
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-10-28 15:05:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-28 15:05:50 -0700
commitf57530e449631658cf9dddfa774ffc3df2383513 (patch)
tree2b56c1ae1c952fb62573c487238bf1871213c3bb /packages/PrintSpooler/res
parenta03fc2c296407a42a568f9acfdf63cb5db536cb4 (diff)
parentfcd69ca4cc1fb9f1f837afc8cf5aece9520aaded (diff)
downloadframeworks_base-f57530e449631658cf9dddfa774ffc3df2383513.zip
frameworks_base-f57530e449631658cf9dddfa774ffc3df2383513.tar.gz
frameworks_base-f57530e449631658cf9dddfa774ffc3df2383513.tar.bz2
am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev
* commit 'fcd69ca4cc1fb9f1f837afc8cf5aece9520aaded': MediaPlayer: MTP: update state only based on source events
Diffstat (limited to 'packages/PrintSpooler/res')
0 files changed, 0 insertions, 0 deletions