summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-10-28 15:09:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-28 15:09:02 -0700
commit128537f600e14c941656e648205987083f4096c3 (patch)
tree27c257bdb44d2a9245ce13737d2a5fb17cc5fdc4 /core/java
parent93a8c8e02870b21b5b454654aad306188fbab73d (diff)
parentf57530e449631658cf9dddfa774ffc3df2383513 (diff)
downloadframeworks_base-128537f600e14c941656e648205987083f4096c3.zip
frameworks_base-128537f600e14c941656e648205987083f4096c3.tar.gz
frameworks_base-128537f600e14c941656e648205987083f4096c3.tar.bz2
am f57530e4: am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev
* commit 'f57530e449631658cf9dddfa774ffc3df2383513': MediaPlayer: MTP: update state only based on source events
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions