summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-12 22:45:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 22:45:58 +0000
commit36e5a1de725f790ab63bec58f58bed01f2eea466 (patch)
tree802a673275133ec089b9ff43c9690bc0dbd541d4 /res
parenta91c8003b84fa882dcf2b64fc21397419265ed25 (diff)
parent4efde5ebbd235c564f12f71f6b17e8c28d611dd7 (diff)
am 4efde5eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '4efde5ebbd235c564f12f71f6b17e8c28d611dd7': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions