tree c4fd8dac2ec54e3f5986f09d83b2ac77b13c7f94
parent a6b9390949c4aa6f7de09fd0f44bb35ed7aabbc7
parent f55d132ae02529afe962544a1200a91bc3440e12
author Nancy Chen <nancychen@google.com> 1422302072 +0000
committer android-build-merger <android-build-merger@google.com> 1422302072 +0000

am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
automerge: f55d132

* commit 'f55d132ae02529afe962544a1200a91bc3440e12':
  Add method in TelecomManager to return line1Number for a PhoneAccount.