commit | 3cf1a9452457f5e2165d18eba4daf9fab57af746 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Oct 11 20:53:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 20:53:19 2017 +0000 |
tree | f353f399c641e22c4629ebfb4ded8282bccfdad9 | |
parent | 051049b30561f282cafb8f529ae18c412b095ea1 [diff] | |
parent | 9ba5681aecbb06f5f4df9826cb17816aca85f982 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp am: 9ba5681aec -s ours Change-Id: I43bac3255871563f4126d119d068cf2f9b1f56e7