commit | e0a07a210d3f7e065739153cf094f7af018e565a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jul 26 23:37:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 23:37:14 2017 +0000 |
tree | 70ce4720e97a45cbbb435e06cd5ffa4705d0b6a1 | |
parent | eea2441f0ab8759313832d45cf575683225839d0 [diff] | |
parent | 527cd8b04d66d3316826dcaeba2bae792a28c073 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours Change-Id: I6b4285fbad58d296305cee0e6698dd6925538024