tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent d46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2
parent 4cdee7a61b140cf1a38b3d1eb1ac596525aa609b
author Eric Fischer <enf@google.com> 1365535923 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535923 -0700

am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE

* commit '4cdee7a61b140cf1a38b3d1eb1ac596525aa609b':