summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJohn Grossman <johngro@google.com>2012-07-19 00:39:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-19 00:39:29 -0700
commitecedbf9e04a56227a3693c88b548635d9efc76bd (patch)
tree9fb852e1bc49d7ae79f27629aa0e5d2c63799f60 /core/jni
parent0b9361d5f9248cdfa318d79c967afae2b308d305 (diff)
parentc43a685c3027791b21294a2ef423a6129cb49ad4 (diff)
downloadframeworks_base-ecedbf9e04a56227a3693c88b548635d9efc76bd.zip
frameworks_base-ecedbf9e04a56227a3693c88b548635d9efc76bd.tar.gz
frameworks_base-ecedbf9e04a56227a3693c88b548635d9efc76bd.tar.bz2
am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah
* commit 'c43a685c3027791b21294a2ef423a6129cb49ad4': Change audio flinger to user HAL master mute if available: DO NOT MERGE
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions