tree e3fff29754feb64c5be38a550103cd709c529c0d
parent 35ba2cdbf8654d708e57d209131dd498705d0e18
parent d2a8d71ce0eeb14034ec779a00e5ff6a0e173fb4
author Jae Seo <jaeseo@google.com> 1437425107 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437425111 +0000

Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev