commit | 8a32534a1d37a67e320a1b00e9c222760832fce0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jun 28 15:28:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 15:28:14 2017 +0000 |
tree | 442ee71b495c6530502ed1b6b5505601010742df | |
parent | 908fb57142d50e3fb34f5e056ea05b60de2ac3e0 [diff] | |
parent | 270ef883afe903239e8ec39c6e3dff5f52da0df9 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424 -s ours am: 270ef883af -s ours Change-Id: I8b5f947a09796fdc59cc170b894ba48c844faef3