| commit | 993a018a5a40753ddbe91511eb30d1f0179310dc | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 09 09:12:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 09:12:39 2013 -0700 |
| tree | 43a12f8a57b5d35bb9d77dd32705023b5f71d5cb | |
| parent | 2ce37ff284bafb5d3ce60736ea95553b3317febc [diff] | |
| parent | 870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7 [diff] |
am 870a6a54: am ff7dc101: am 205b3775: merge in KQS81M * commit '870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7': Add MEDIA_CONTENT_CONTROL permission