summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-04 15:17:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 15:17:29 +0000
commit2145b3925a5c965e8c07461dd6e1725f8fcd1379 (patch)
treed237d9246e1f9b963d1981f8a951dbae23f8a104 /res
parentc637febf8893f28a66cc73fb92fc700667be68e1 (diff)
parent7b79c35186c5e8e6fc4fe6ec9411383253777083 (diff)
am 7b79c351: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '7b79c35186c5e8e6fc4fe6ec9411383253777083': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions