diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-07 18:30:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:30:48 +0000 |
commit | d601e9736531937c8da7b1ac47f45b17e6dfe440 (patch) | |
tree | 6c685b88e0d9ee25dda2a8ac7d6450ea1a6b91a4 | |
parent | 74e9302f405b629fd8d10cb1061d2239f795e801 (diff) | |
parent | 61365506c17bd9675b31de94a1ed2a2582c232f5 (diff) |
am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '61365506c17bd9675b31de94a1ed2a2582c232f5':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions