commit | dffcf9beaf7b2ebcf7aa24b357c948ecbe26b9ec | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 21 03:49:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 03:49:04 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | d2cca3f1c4dd82e154cd3975a31a1cde9467953d [diff] | |
parent | 215a5d0a535dcdfaebb43ff3d1311f7264dfb8f4 [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: 215a5d0a53 -s ours Change-Id: I2cad861c5568053ff5e3cb6bc40f4c747f4063d8