| commit | c6b6e7f59b2bd150eed605add14000bb05096408 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:42:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:42:40 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 834672cd82e96223472ca315caa04d3d53250f1c [diff] | |
| parent | e6eae1609e73205edd560846a032c89dabe9827f [diff] |
am e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e6eae1609e73205edd560846a032c89dabe9827f':