tree 8db9ab0bf0809911f883e5a146b68ec8eb072760
parent c9c190c2e5a047a3ce9c6e2da5485cafa164f2a9
parent 95e1b1a34e0c97e313a351d902d46d9ee571f511
author Wink Saville <wink@google.com> 1342553799 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342553799 -0700

am 95e1b1a3: (-s ours) Use TelephonyIntents - DO NOT MERGE

* commit '95e1b1a34e0c97e313a351d902d46d9ee571f511':
  Use TelephonyIntents - DO NOT MERGE