OSDN Git Service

am 205b3775: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:47:49 +0000 (15:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 22:47:49 +0000 (15:47 -0700)
commitff7dc1010bd9c38c5b3348ed15d8deda62e13604
tree91e2e6a7b859c30816052fedf8355514734d2e82
parentd2b8377f82a65c76606acbd10802648a378bf673
parent205b3775e344734c9aa0776a8ee14d2cde1f411e
am 205b3775: merge in KQS81M

* commit '205b3775e344734c9aa0776a8ee14d2cde1f411e':
  Add MEDIA_CONTENT_CONTROL permission