| commit | fe8e29942069a2359dffd9d43da6912d78ddf95e | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 17 08:40:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 17 08:40:42 2013 -0700 |
| tree | 61c38b7f1d7fa9c2858b35f99b664be50017d917 | |
| parent | 3159953d9f54561d660e33a080fd2a10f884beeb [diff] | |
| parent | 622f799a8211f387c9a2d564ef48cf459e90100e [diff] |
am c11c43ee: (-s ours) am b923efba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c11c43ee57d26b2d79c7939f9f6a9eaa4e6839d5': Import translations. DO NOT MERGE