tree f38f9a2e9b39e450ab0992a4ee27c1029a79c572
parent 25c48f3613e4095954a70732b71e68d16443d507
parent 771575908dff999cf8c80df7b135298c52ce0b2e
author Eric Fischer <enf@google.com> 1338399958 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338399958 -0700

Merge "Import translations. DO NOT MERGE"