tree e646cc1012f0b782e72179c4722f586d6a657754
parent c725e8d5ea04ffb5821e00db1c6b45cfe2130e05
parent 9bd253a913a7ea9463b38291e5bceffea3ee15ea
author Geoff Mendal <mendal@google.com> 1441037166 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441037166 +0000

Merge "Import translations. DO NOT MERGE"