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