| commit | a8cf5f87b07bed201a9a06bc6678d9b8656b7766 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 06 17:57:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 17:57:01 2014 +0000 |
| tree | 01127deb02b7a38af407388e617b6f1eee46d629 | |
| parent | a04a1fd10304de3f7a471aae6c954548be760c12 [diff] | |
| parent | d010cf12c796cf83c760df037916e5572ce55868 [diff] |
am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd010cf12c796cf83c760df037916e5572ce55868': Import translations. DO NOT MERGE