| commit | 01db71d930114e9a02a0cf319282e17dbf18f1d7 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 20:58:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 20:58:14 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | a2856c4e207fdfdcb76100ff61962660d6b2c82e [diff] | |
| parent | f2640bba5d92a65654fc60e8035f5597407a7930 [diff] |
am f2640bba: (-s ours) am 8d3807ed: am 92ea2c90: (-s ours) Merge "Revert "DO NOT MERGE: Move translation entry point into translate.c."" into klp-dev * commit 'f2640bba5d92a65654fc60e8035f5597407a7930': Revert "DO NOT MERGE: Move translation entry point into translate.c."