OSDN Git Service

Merge "Make master mono controlled through settings" into nyc-dev
authorAndy Hung <hunga@google.com>
Sat, 27 Feb 2016 02:50:04 +0000 (02:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 27 Feb 2016 02:50:07 +0000 (02:50 +0000)
commit2362bdf2c73b24ff3589ecd670c3bde366cde45e
tree0124c0fa43eadd167a8e8395959d382159dc275a
parent7006b01f5d91c77c9f658d392fb2cc183bc504be
parent7b98e9a7e56213f90665c2c9aec213de8557021b
Merge "Make master mono controlled through settings" into nyc-dev
media/java/android/media/AudioManager.java