summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-06-20 09:12:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-20 09:12:59 -0700
commit6009dc014f8fa0aefc68e7265761960c5433d108 (patch)
treee07d665f8971abdbfbd8e92063b32db9c475991c /core/jni
parent0fa755a7bb78f67b244d26c472bf279800558c57 (diff)
parentb92d2a13c4ab34862968f47191d2713de3701757 (diff)
downloadframeworks_base-6009dc014f8fa0aefc68e7265761960c5433d108.zip
frameworks_base-6009dc014f8fa0aefc68e7265761960c5433d108.tar.gz
frameworks_base-6009dc014f8fa0aefc68e7265761960c5433d108.tar.bz2
am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev
* commit 'b92d2a13c4ab34862968f47191d2713de3701757': Remote volume handling in MediaRouter
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions