| commit | b158819d4b86e920413b5cc57e168357a0fb4203 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Dec 18 20:55:49 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 18 20:55:49 2013 -0800 |
| tree | ff1ffc42daa7f1aefd9617d7e4546483f149d516 | |
| parent | 9619cddb014f090ec4d84eb817157c7bfad94c05 [diff] | |
| parent | 2e371ee14a59ecedeaa02d1b5f7fc518f9203520 [diff] |
am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2e371ee14a59ecedeaa02d1b5f7fc518f9203520': Import translations. DO NOT MERGE