| commit | 688cd80ca66fc872cc10b6ad51facf332d66ab0d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 19:59:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 19:59:05 2013 -0800 |
| tree | 0081b8a8ac39462cf3f8dcd749350f880b45278b | |
| parent | 11152efd750cd2ff3656cbd5593d468d6ad842f2 [diff] | |
| parent | deb0189c365bf7f96c2e01be5e2b2daddf0642b3 [diff] |
am deb0189c: (-s ours) am 4b67a56b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'deb0189c365bf7f96c2e01be5e2b2daddf0642b3': Import translations. DO NOT MERGE