summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-08-15 16:11:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-15 16:11:55 +0000
commitf62cf88d0464c3741319f674bfb0836a08308c88 (patch)
tree631c5dd62f3f928743438b379dd84a8ed836f5d0 /res
parentc6ac0888ee99f36c5ea92b79b916e9bd83dc7168 (diff)
parent4069b050f1fbdba99b72474fae0d83c7cb243488 (diff)
am 4069b050: (-s ours) am 2ba60e4a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '4069b050f1fbdba99b72474fae0d83c7cb243488': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions