commit | 305c9d2846dc7cfcce5827b74d144facdb5e12fd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri May 05 12:13:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 05 12:13:15 2017 +0000 |
tree | 137c5404f41fa14353650c27b8db0883e71c93a6 | |
parent | f137d1b9e2f0008e6050e2f3c37418c54deda7b5 [diff] | |
parent | 0984cb48d580651ad74a1651db58ad064b3a31f9 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d95e04111 -s ours am: 0984cb48d5 -s ours Change-Id: I689917a893721e173996875393e1b8d68d827e54