tree 6536a7238976807f0157b8794337bbfb18b7ac69
parent 3a66e9b653dca12fd35fd8c9a26e0bf6f78f192f
parent 87aa4b2568e53fe0ebe60507bdf61c5c55f5e5a0
author Eric Fischer <enf@google.com> 1328899791 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328899791 -0800

am 87aa4b25: am a1467911: Import translations. DO NOT MERGE

* commit '87aa4b2568e53fe0ebe60507bdf61c5c55f5e5a0':