| commit | 9f9c0a00ff08bed5cbc4671fa658e1532a03715a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 23 19:36:12 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 23 19:36:12 2013 -0700 |
| tree | 51b080ab8440a10d1d40eb0f7933b14a523cfbd7 | |
| parent | e35d3c2ae98aca64df971d9d53a8cb9eb1ae9f7f [diff] | |
| parent | deaad328df2b155cdcc91dd45daaecf81fa6845c [diff] |
am deaad328: (-s ours) am 1f067222: (-s ours) am ffbc7154: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'deaad328df2b155cdcc91dd45daaecf81fa6845c': Import translations. DO NOT MERGE