summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-10-23 23:15:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-23 23:15:37 +0000
commiteb0a058ce1fd86464695d6848877ca42d23398a5 (patch)
treeffe05d7cbe14dd79d2815043cab72d5e979c34b6
parent93b434451abd11ff58ada66abdcddb3f33bb5023 (diff)
parentb31868df32ef287a561134ecbc96592f657763a3 (diff)
downloadframeworks_base-eb0a058ce1fd86464695d6848877ca42d23398a5.zip
frameworks_base-eb0a058ce1fd86464695d6848877ca42d23398a5.tar.gz
frameworks_base-eb0a058ce1fd86464695d6848877ca42d23398a5.tar.bz2
am b31868df: Merge "Remove TODO in TelecomManager." into lmp-mr1-dev
* commit 'b31868df32ef287a561134ecbc96592f657763a3': Remove TODO in TelecomManager.
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 191273b..2652b45 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -31,7 +31,6 @@ import java.util.List;
/**
* Provides access to Telecom-related functionality.
- * TODO: Move this all into PhoneManager.
*/
public class TelecomManager {