tree 2d6c8fed0188d3a7e3484f8818cb1e73a132928d
parent 4910cad70d7474c2fddefefd25104548cc626d64
parent 97b8a9325af8b88aa42166640a4e831754f9f32d
author Geoff Mendal <mendal@google.com> 1428139659 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428139660 +0000

Merge "Import translations. DO NOT MERGE"