summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-28 07:11:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 07:11:10 +0000
commit17ea9d250ca50ff6a9892625930cb93f7b2294ae (patch)
tree8c87a58b0decdea38a7dbb732f5209e589f0f626 /res
parent10af602941a93f1cbd808f080c9fd223d8cd6924 (diff)
parent076e9841dc30866e802ac9142fa2f9961bf536c7 (diff)
am 076e9841: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '076e9841dc30866e802ac9142fa2f9961bf536c7': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions