tree 37606d47a6c3f8fe2072ea3c4a662f23035a951b
parent 38a42a0680a284675e3085067364171de3b6a59e
parent da69d34d2d072726b0cc6ddde38de5eb96db16d7
author Eric Fischer <enf@google.com> 1335816465 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335816465 -0700

Merge "Import translations. DO NOT MERGE"