summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-12-05 21:07:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-05 21:07:22 +0000
commit41d8d8e79f41f1295c5763c4257bf7c743088678 (patch)
treeea084b4e5befb3ba62cb18234279df7fd3fcb73f /services
parent668b055081bb9d0d61775acf67bb27ce66b214f6 (diff)
parent57216ca41b2d7e35bda01ce910ae6e72ed01bfae (diff)
downloadframeworks_av-41d8d8e79f41f1295c5763c4257bf7c743088678.zip
frameworks_av-41d8d8e79f41f1295c5763c4257bf7c743088678.tar.gz
frameworks_av-41d8d8e79f41f1295c5763c4257bf7c743088678.tar.bz2
am 57216ca4: Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev
* commit '57216ca41b2d7e35bda01ce910ae6e72ed01bfae': Track volume should be maintained even if track is restored
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions