| commit | dfe7ff80e18e84cf7437e1d600103e10578c3dec | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 23:11:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:11:52 2014 +0000 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | 5384357c7ba9d369cf6264a03bd3f9240a76ac76 [diff] | |
| parent | 786e40a32eed699662332e197f3d7953d3e60b03 [diff] |
am 786e40a3: resolved conflicts for merge of 253009ac to klp-modular-dev-plus-aosp * commit '786e40a32eed699662332e197f3d7953d3e60b03': DO NOT MERGE: Move translation entry point into translate.c.