commit | 1c6a01293a69806c4710693dbb2cc265a98d3e1d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 13 08:15:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 13 08:15:09 2017 +0000 |
tree | 25fb3e9f0846f0482135e14ea8e15e6d6be5a0c4 | |
parent | c8752ca07ce8b7d0afeafe4f00687ea9bc88f501 [diff] | |
parent | 0c2bb34f5ce1b4cee2a23bba56c3bb719ca3cd79 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am: 0c2bb34f5c -s ours Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57