commit | b6584aeb115f5515bc08192bf9b36625313423ba | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 13 16:11:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 13 16:11:39 2017 +0000 |
tree | 0f9c50c60707e582c69818e2d1dd49d953ab3ade | |
parent | a9b6df9a745f2a657eb19276565a679df64dfe22 [diff] | |
parent | ff5416e5dc4c336473ce2d3bbc5e75089c0740ae [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4c44a3059c -s ours am: ff5416e5dc -s ours Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4