tree bea8d97733a13d4105ccf2a0dc03de8daa43058a
parent 4496a3fecabb26671e745c2b6edcb54989f8c045
parent 2515cf85d50ef137a6e4a15a79a75a51c923ce6f
author Robert Greenwalt <robdroid@android.com> 1255076899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255076899 -0700

am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager

Merge commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f' into eclair-mr2-plus-aosp

* commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f':