diff options
| author | Andy Stadler <> | 2009-04-10 16:24:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 16:24:47 -0700 |
| commit | f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch) | |
| tree | 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /media | |
| parent | 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff) | |
| download | frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2 | |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 2f0007f..8f05cec 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -272,7 +272,6 @@ public class RingtoneManager { * manager is returning. * * @return The stream type. - * @hide Pending API Council approval */ public int inferStreamType() { switch (mType) { |