commit | cb4c0af58b99567cf4e382ebab2eba6123e78362 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 16 20:07:08 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 20:07:08 2017 +0000 |
tree | 9c065f0d055c7f7d484018bf68211ec0dff7da34 | |
parent | c17f8d9967e310b4886182a72417900a7cf45ad6 [diff] | |
parent | 242c84fa25a8d3c8a8862d724ae6b107d638fa09 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d3ad51ae77 -s ours am: 242c84fa25 -s ours Change-Id: I2753e9a5800f82740fd587ab3f2d84a7b6b350d7