summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityManager.java
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-08-07 19:17:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-07 19:17:14 +0000
commitb8ade1e976d91cea308c1cf23944e092debe7c6f (patch)
tree6c0f279ba262c3c575257d5b45b4879ee7d685ec /core/java/android/app/ActivityManager.java
parent0cb13caff6402810879afe63c558cd8d4345ab94 (diff)
parent4552829ae0b89c323fd1b9f773b68eb56f069e53 (diff)
downloadframeworks_base-b8ade1e976d91cea308c1cf23944e092debe7c6f.zip
frameworks_base-b8ade1e976d91cea308c1cf23944e092debe7c6f.tar.gz
frameworks_base-b8ade1e976d91cea308c1cf23944e092debe7c6f.tar.bz2
am 7bffa188: am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
* commit '7bffa188c6cfc180b0efea2e7d00b73088acb875': Add setting to disable automatic USB audio routing
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
0 files changed, 0 insertions, 0 deletions