tree c8a098f3ee1944efdc9a376d9b85e3eea891bb2a
parent a945aad739fbe8b3c212ce5aa0bbc5d8c021612d
parent 14766b1910349bdb6b426ca7f769fa868bc00190
author Eric Fischer <enf@google.com> 1332537563 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332537563 -0700

Merge "Import translations. DO NOT MERGE"