tree 1288b5a1c70fb4b346f5f8cfd2ffa0e6ad3d8ed2
parent d1c4bf61076871947c7dff35b21b6aac75d4e590
parent 171f5eaffc064472460bc61f33280c8d2205d172
author Eric Fischer <enf@google.com> 1335819403 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335819403 -0700

Merge "Import translations. DO NOT MERGE"