| commit | e35d3c2ae98aca64df971d9d53a8cb9eb1ae9f7f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 23 19:36:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 23 19:36:09 2013 -0700 |
| tree | 51b080ab8440a10d1d40eb0f7933b14a523cfbd7 | |
| parent | 15c33af2a30a6e9a6b3c3cc946a11fc600fefb7d [diff] | |
| parent | 81ee99f97b43336136d6b745179e20e502d83a96 [diff] |
am 81ee99f9: (-s ours) am 12583441: (-s ours) am 39a12d16: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '81ee99f97b43336136d6b745179e20e502d83a96': Import translations. DO NOT MERGE