commit | d09f4027afba307df9713e4475edae6d922127b6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Aug 05 18:20:58 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 18:20:58 2016 +0000 |
tree | e9821e20f11b593efd9efca061aa5ea5eb6987df | |
parent | 31f1ed60e2891ddfc3f6f1ab7604392b95990468 [diff] | |
parent | d77f36549c5740399a774836cc35ca9dc68d9427 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: ca0fad438c -s ours am: d77f36549c -s ours Change-Id: I34bba274f0abd88ef33f1d9bceb43a6e8bbf4ce9