OSDN Git Service

am 5af27de0: resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 2 May 2012 22:31:49 +0000 (15:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 May 2012 22:31:49 +0000 (15:31 -0700)
* commit '5af27de0b59b3a49298066a652d9fa37ff71cbf0':
  Enable sound effect support in the SDK system image


Trivial merge