tree 90eeac0503fa932e670260a78ec2e971edd3a969
parent 6b8619728cc727e402efabd57efa22503707cdf1
parent a6577f4b162c9f6d8084e19a6cc5792cf52e4872
author Wink Saville <wink@google.com> 1362069328 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362069328 +0000

am a6577f4b: Merge "Telephony: Return \'null\' when SubscriberId and Line1Number are unavailable"

* commit 'a6577f4b162c9f6d8084e19a6cc5792cf52e4872':
  Telephony: Return 'null' when SubscriberId and Line1Number are unavailable