summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-04-28 15:14:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 15:14:21 +0000
commit328672822ce5bbffba05964cb25725b6817b4b57 (patch)
tree15ad1ffb11825b6684626242c9a608d6398dca5f /packages
parent7d6a36f08dda0dc3bccd7ea5680c0b5d8b33a868 (diff)
parentea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e (diff)
downloadframeworks_base-328672822ce5bbffba05964cb25725b6817b4b57.zip
frameworks_base-328672822ce5bbffba05964cb25725b6817b4b57.tar.gz
frameworks_base-328672822ce5bbffba05964cb25725b6817b4b57.tar.bz2
am ea07d1cb: (-s ours) am b268f606: (-s ours) am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e': Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions