| commit | 870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 08 15:58:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 15:58:15 2013 -0700 |
| tree | 5ffdc65f1c9c1e24fd54fbc697c9637f4a535188 | |
| parent | fbfd55a85870939523665dfd7c24844d3e3c4715 [diff] | |
| parent | ff7dc1010bd9c38c5b3348ed15d8deda62e13604 [diff] |
am ff7dc101: am 205b3775: merge in KQS81M * commit 'ff7dc1010bd9c38c5b3348ed15d8deda62e13604': Add MEDIA_CONTENT_CONTROL permission