| commit | 1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Apr 04 14:53:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 14:53:11 2014 +0000 |
| tree | 2d572bc730d6dc24f6f6157f5888fd058f8a342c | |
| parent | 31e51bab1530c93183467d7fa5371a725ed910d6 [diff] | |
| parent | 871322653c4109a9640b56374a246120c65f8241 [diff] |
am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '871322653c4109a9640b56374a246120c65f8241': Import translations. DO NOT MERGE