| commit | cfc26faeed96a10d9b93fab10cce0e9fc2fb25a1 | [log] [tgz] | 
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Nov 05 08:00:17 2013 -0800 | 
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 08:00:17 2013 -0800 | 
| tree | 858179056dcb0d807d989cc404b79109db91d542 | |
| parent | 79cfdb20be13e424089849a92c49516bfe785c90 [diff] | |
| parent | 17e8f4377cac0f168deabf5ea1dfb435394ac571 [diff] | 
am 17e8f437: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '17e8f4377cac0f168deabf5ea1dfb435394ac571': Import translations. DO NOT MERGE