summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-12-08 19:17:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:17:53 +0000
commit4ac5f97cc5440e566691a2431053c253b3577342 (patch)
tree0aa7b28766494121b782ef6996e4e04f012e7fd3 /services
parentf3376bdbcb48daad6889d28ee2c98b174f12028e (diff)
parent41d8d8e79f41f1295c5763c4257bf7c743088678 (diff)
downloadframeworks_av-4ac5f97cc5440e566691a2431053c253b3577342.zip
frameworks_av-4ac5f97cc5440e566691a2431053c253b3577342.tar.gz
frameworks_av-4ac5f97cc5440e566691a2431053c253b3577342.tar.bz2
am 41d8d8e7: am 57216ca4: Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev
* commit '41d8d8e79f41f1295c5763c4257bf7c743088678': Track volume should be maintained even if track is restored
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions