tree 4083693dbd08000367f4cd7ec6ff98321ff9dd54
parent 9779e9f5aca5e8179ac02aafaeaa7cb1d65765d2
parent e7ee9a0504db7127be05a2c27794f6a2b20b2951
author Eric Fischer <enf@google.com> 1331590657 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331590657 -0700

Merge "Import translations. DO NOT MERGE"