tree 5c1ce949356d8dc28066b012da240e5a0dc47f48
parent 06ade3db26c3e9fbacf2fa3c4ffc3b2440c7e971
parent ed585f05c8c4f579a62890c6c64401e3c03c3864
author Eric Fischer <enf@google.com> 1336414694 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336414694 -0700

Merge "Import translations. DO NOT MERGE"