tree 684b5e9dc00da63e264f24d29c3e01b25c1e6a26
parent f983ad499792ef8569d68d90f30042ff1c5b9ee6
parent 6799d450c4f0e129eb5c414a93dc553d7058e941
author Wink Saville <wink@google.com> 1342559329 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342559329 -0700

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

* commit '6799d450c4f0e129eb5c414a93dc553d7058e941':
  Use TelephonyIntents - DO NOT MERGE