tree 44ab22dce67814e54cd0bc9eee8774786374f0bf
parent 409d7b24497422ddb9e0ad036e68e7a3f5a4dd67
parent 4614991d859b3f7b6e1839d4bfcbd2711b0721de
author Geoff Mendal <mendal@google.com> 1429705602 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429705605 +0000

Merge "Import translations. DO NOT MERGE"