diff options
author | Nancy Chen <nancychen@google.com> | 2015-01-26 19:54:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-01-26 19:54:32 +0000 |
commit | 885c856e6babfe88be1d6a029f185329bb3dfcc7 (patch) | |
tree | c4fd8dac2ec54e3f5986f09d83b2ac77b13c7f94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a6b9390949c4aa6f7de09fd0f44bb35ed7aabbc7 (diff) | |
parent | f55d132ae02529afe962544a1200a91bc3440e12 (diff) |
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.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions