OSDN Git Service

am 04775216: resolved conflicts for merge of f3804c3c to lmp-sprout-dev
authorYorke Lee <yorkelee@google.com>
Sun, 14 Sep 2014 21:17:09 +0000 (21:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 14 Sep 2014 21:17:09 +0000 (21:17 +0000)
commitb0d1e38efb9bc7cf7c8467c4d1b5b25939b0d3fa
treef374cf3384faee5119b7452ee21d0e705aa94532
parentbad48708fc161fbfc124d9618db988d6f2f1153f
parentee743e6071787335afce30d8f39e3ce7df9d11ea
am 04775216: resolved conflicts for merge of f3804c3c to lmp-sprout-dev

* commit '047752165e14831048be17961952954f4e470f8a':
  Pipe TelephonyManager.getCallState through TelecommManager