OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f54221 6736f71)
am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type...
authorJean-Michel Trivi <jmtrivi@google.com>
Mon, 21 Jul 2014 18:23:51 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 18:23:51 +0000 (18:23 +0000)
* commit 'bf99d8c31160cf61a25371759068592461cbc71a':
  Add AudioAttributes to stream type conversion


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help