commit | 49b5de942e05ed95740f51f27210ac4f4cdf251e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 13:31:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 13:31:23 2017 +0000 |
tree | 370e4a48c6e88dee1fd3e0bb55cd111c5c1ca8a7 | |
parent | c8c242379a87347d18cbe01fe111513163a72925 [diff] | |
parent | a043cf04df8a4e18d21c5d09d10dab9d3bd58386 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: bbeaae705d -s ours am: a043cf04df -s ours Change-Id: I335191d70ae5fe79fe7d1ea9c334ecd6d82a60e3