| commit | a9c58be1974512b8a0b26ace7e5d2027070c7f92 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 11 08:16:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 08:16:10 2013 -0700 |
| tree | 30caa9d80710cb7eb5f6d0f2f9f05edcdffadbc4 | |
| parent | fde639ae61eeb3841ba69ab893b945f742bfb3a8 [diff] | |
| parent | 1ac6173a86a9c19d2f88073bfc609392cdb6abdc [diff] |
am 9aa75f29: (-s ours) am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '9aa75f29a6259f8c65a5e1ad507f71ea3b419d47': Import translations. DO NOT MERGE