tree f03503c967b8db75837f9840c6d72416dcb09cc8
parent 10454ee1f76bd06e1d7fe8300af38dfe42f4a954
parent 16779256116983d8caf5e552a311a682e4c1e1ab
author Yorke Lee <yorkelee@google.com> 1386283506 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283506 +0000

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

* commit '16779256116983d8caf5e552a311a682e4c1e1ab':