commit | 0d445db14459fbae6f878fcd274bff5407bae93c | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 06 22:55:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 22:55:25 2014 +0000 |
tree | 8067cb3e804339e5cb879e880284817a449f831d | |
parent | 5300c4266ba2a845755b91d8c3cd4f866bf15876 [diff] | |
parent | c5d3d02549c7971bb9690e322c6857c4868760df [diff] |
am c5d3d025: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c5d3d02549c7971bb9690e322c6857c4868760df': Import translations. DO NOT MERGE