tree 6e77daa16f93b81cb150ca408ca98f36b112cccc
parent c12a5011a5e369a85d5944ab0cf8ea6275f0b339
parent 7b6c66d5ad5550579f165c053b366195fa96979c
author Eric Fischer <enf@google.com> 1328897587 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897587 -0800

am 7b6c66d5: (-s ours) am 077cf819: Import translations. DO NOT MERGE

* commit '7b6c66d5ad5550579f165c053b366195fa96979c':