summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2016-01-11 15:51:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-11 15:51:36 +0000
commit4c042b096e3b25f7292d13b4c44d79cb79ebeb36 (patch)
treeb64520b487c96afa51a8fa117733868e4011bccc /telephony
parentddee7d949dbd1fd5d18e11322532e78cd8330554 (diff)
parent8635657b176ee9f80e8f57a7d1da9278722ff8a0 (diff)
downloadframeworks_base-4c042b096e3b25f7292d13b4c44d79cb79ebeb36.zip
frameworks_base-4c042b096e3b25f7292d13b4c44d79cb79ebeb36.tar.gz
frameworks_base-4c042b096e3b25f7292d13b4c44d79cb79ebeb36.tar.bz2
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours
am: 8635657b17 -s ours * commit '8635657b176ee9f80e8f57a7d1da9278722ff8a0': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions