tree 27b617a2a4375995cc8eb38cca4fa5e2d78d689b
parent db3146c039750f68418e0908037a8bed3890913c
parent 60d7c9957891280dfb131d5d58f32cf6fb82d5a2
author Zhihai Xu <zhihaixu@google.com> 1394666711 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394666711 +0000

am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev

* commit '60d7c9957891280dfb131d5d58f32cf6fb82d5a2':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager