commit | b4b2fe7948ee02a96a218c40c6a7522b0165b692 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 09 16:20:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 16:20:55 2017 +0000 |
tree | 3ffe01bf3ae29b64135046a72c35a77f9f08a63e | |
parent | 3ca2083d126fa82a79767b57816dae770f89d5da [diff] | |
parent | de19b85c6c98bfa9e6ee9451320e7571f97b83c8 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours am: 1de3fd81e0 -s ours am: de19b85c6c -s ours Change-Id: I2db346eda1e5abd2ddfffc6b19fc5c5eae1d3f57