commit | 1bf211b56131d831196ef7f43911adda328adafd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 11 04:13:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 11 04:13:40 2017 +0000 |
tree | b9bdfe604ef692003c7d33e81b3b4678f6eba499 | |
parent | fbb28a6b2bd97c0aa44b6c99fd7049f1a78dedf3 [diff] | |
parent | 0c4e14d0ae82504472680288067cc19ac5f0d586 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2 -s ours am: 8b44d3722d -s ours am: 0c4e14d0ae -s ours Change-Id: Ie5ff3962adbf96ef93464061d61c0ab15917281b