OSDN Git Service

am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into...
authorJean-Michel Trivi <jmtrivi@google.com>
Sun, 20 Jul 2014 18:01:58 +0000 (18:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Jul 2014 18:01:58 +0000 (18:01 +0000)
* commit '895de04e7ca22494e46f20064e2133fc1f915d56':
  Add AudioAttributes to stream type conversion


Trivial merge