summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-20 23:43:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 23:43:33 +0000
commita9a550dd8e87b33979670cf856838ba227500547 (patch)
tree785f26135bcc7fd73181311e450c0c6211913426 /packages
parent17e9d2468fea360ab17679161f31cf6a38198fc7 (diff)
parentdeddb38462389823c194559052c4d64ee6c3b467 (diff)
downloadframeworks_base-a9a550dd8e87b33979670cf856838ba227500547.zip
frameworks_base-a9a550dd8e87b33979670cf856838ba227500547.tar.gz
frameworks_base-a9a550dd8e87b33979670cf856838ba227500547.tar.bz2
am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'deddb38462389823c194559052c4d64ee6c3b467': Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions