OSDN Git Service

am cc85a9ed: resolved conflicts for merge of 66c16547 to lmp-sprout-dev Also fixed...
authorTyler Gunn <tgunn@google.com>
Sat, 13 Sep 2014 20:22:02 +0000 (20:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Sep 2014 20:22:02 +0000 (20:22 +0000)
commit4909b1cdf2abb78013633a1f6ea5a026161d8445
tree3d9a7307e8cca098d8f22e9515d1ce1307371523
parentf4bcf0db23b524838c699907b1a638c8ad55c4bb
parent6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025
am cc85a9ed: resolved conflicts for merge of 66c16547 to lmp-sprout-dev Also fixed issue in TelephonyManager.

* commit 'cc85a9edce094412f0e4cac9b985abbf2d96f073':
  Renaming Telecomm to Telecom.