summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-27 22:26:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 22:26:35 +0000
commitf9fba9fdf3053f356d3a129198d95903beb3b1d0 (patch)
tree8d2f5c22f54088be3981b01587ece4461009be94 /res
parentcbf49aa54b2d6c87367deabca67e484e072e23a0 (diff)
parent6e9c3763b87cb8b8c2f5523f7b8037bf46387dcd (diff)
am 6e9c3763: (-s ours) am 3e9fac90: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '6e9c3763b87cb8b8c2f5523f7b8037bf46387dcd': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions