summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-01-26 16:55:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-26 16:55:20 +0000
commit6c67474dd4f6eb0894121dac67e797073a02980a (patch)
treed62a088820cefcaff3cf385c1dfe7d1808b56e54 /core
parent4fe4bca1725d8205d00a36b656d2787b16e86984 (diff)
parent3d8f41913c43b3c82b20aef1572fc5a0f7126589 (diff)
downloadframeworks_base-6c67474dd4f6eb0894121dac67e797073a02980a.zip
frameworks_base-6c67474dd4f6eb0894121dac67e797073a02980a.tar.gz
frameworks_base-6c67474dd4f6eb0894121dac67e797073a02980a.tar.bz2
am 3d8f4191: (-s ours) am 3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '3d8f41913c43b3c82b20aef1572fc5a0f7126589': Import translations. DO NOT MERGE
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions