tree 701114b5c0756dc29829857bdb8d6e8048c01ac0
parent 261431a646f3eb3800a70d4d0f82e901481140cc
parent 4a909ab8cd1a0e78c5af8fc531b8c702e8ae0aa0
author Yorke Lee <yorkelee@google.com> 1386272417 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386272417 +0000

am 4a909ab8: am d121059a: Merge "Make sure to not call getTelephonyManager with null context" into klp-dev

* commit '4a909ab8cd1a0e78c5af8fc531b8c702e8ae0aa0':