tree 26fcfd4e61005041cd6c879f1cb5d30e26b133a0
parent 20d93061a5e23e728f1119efd3d6688ce62d0b57
parent b6414de98dd0d8ef12e3a1fdfac098e0b6bbed61
author Eric Fischer <enf@google.com> 1338324127 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338324127 -0700

Merge "Import translations. DO NOT MERGE"