summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-11-10 14:40:48 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-10 14:40:48 -0800
commit88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62 (patch)
tree0e19e5ec349471a2aeb0aee99574ec7d98899a1f /include/media
parent15843aa5f66fee8eee5e634508dbf83a4e5ab55d (diff)
parent43150bfa9377ca7a5fe0e6bfcdc04fb5807501f7 (diff)
downloadframeworks_base-88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62.zip
frameworks_base-88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62.tar.gz
frameworks_base-88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62.tar.bz2
Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions