tree dda33b16ccaf00da3f9a17ec7df069cb6bf6d3ee
parent 774bd377df3053ef43e34ab8ca98160eb6811be1
parent a3fceb1f57d99ae97787c4ccfb5233b08ecfd5ff
author Eric Fischer <enf@google.com> 1287789018 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287789018 -0700

am a3fceb1f: (-s ours) am cbf7a73e: Import revised translations.  DO NOT MERGE