| commit | ff7dc1010bd9c38c5b3348ed15d8deda62e13604 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 08 15:47:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 15:47:49 2013 -0700 |
| tree | 91e2e6a7b859c30816052fedf8355514734d2e82 | |
| parent | d2b8377f82a65c76606acbd10802648a378bf673 [diff] | |
| parent | 205b3775e344734c9aa0776a8ee14d2cde1f411e [diff] |
am 205b3775: merge in KQS81M * commit '205b3775e344734c9aa0776a8ee14d2cde1f411e': Add MEDIA_CONTENT_CONTROL permission