diff options
author | Baligh Uddin <baligh@google.com> | 2013-11-01 08:12:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 08:12:16 -0700 |
commit | 309e27d211972ba968179083695cf0d9be747dee (patch) | |
tree | c3a6f0355d95d5c29767d9d1df3b1e10a40ab98b | |
parent | 22a58d6ee6d92ae393a7b38fe2bdc0e68e6007ac (diff) | |
parent | f625246b6d08d516d4b923ecb005ddf2e9d232c8 (diff) |
am f625246b: (-s ours) am fcc395b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f625246b6d08d516d4b923ecb005ddf2e9d232c8':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions