| commit | deaad328df2b155cdcc91dd45daaecf81fa6845c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 23 19:33:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 23 19:33:37 2013 -0700 |
| tree | bffe732b029a1838e529349dd83be6a5a4e6c997 | |
| parent | 81ee99f97b43336136d6b745179e20e502d83a96 [diff] | |
| parent | 1f067222c66e00de5bf2f74b69033359d918c9ff [diff] |
am 1f067222: (-s ours) am ffbc7154: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1f067222c66e00de5bf2f74b69033359d918c9ff': Import translations. DO NOT MERGE