tree d43759c4e960e417837042f3004a16c4851be02b
parent daa2824f9169ceb52926cf2b2d3b9671003c02f0
parent c10981d2a7e1d477c78e375d3d876fbafd3a02f2
author Matthew Xie <mattx@google.com> 1414388228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388228 +0000

am c10981d2: am 17771285: Merge "ignore telephony call state if telephony mgr state is idle"

* commit 'c10981d2a7e1d477c78e375d3d876fbafd3a02f2':