diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-09-19 08:52:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 08:52:07 -0700 |
| commit | 58910a746ebf915264b87536ab25148a94714ca2 (patch) | |
| tree | d253ce3e6fd26baef9c4e526c666e47813d66524 /core | |
| parent | 5bb7cefa6f4e068057065c9090a4bb09972487f0 (diff) | |
| parent | 1608f496a34c001ac3836fb77d8aefdb114e82dc (diff) | |
| download | frameworks_base-58910a746ebf915264b87536ab25148a94714ca2.zip frameworks_base-58910a746ebf915264b87536ab25148a94714ca2.tar.gz frameworks_base-58910a746ebf915264b87536ab25148a94714ca2.tar.bz2 | |
am 1608f496: Merge "Public API for RemoteController" into klp-dev
* commit '1608f496a34c001ac3836fb77d8aefdb114e82dc':
Public API for RemoteController
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6898ab0..4c15e18 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2107,7 +2107,7 @@ android:description="@string/permdesc_captureSecureVideoOutput" android:protectionLevel="signature|system" /> - <!--@hide Allows an application to know what content is playing and control its playback. + <!-- Allows an application to know what content is playing and control its playback. <p>Not for use by third-party applications due to privacy of media consumption</p> --> <permission android:name="android.permission.MEDIA_CONTENT_CONTROL" android:label="@string/permlab_mediaContentControl" |