commit | a90c3c8948c678b92fafffe30bf393ff911ea769 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 13:30:03 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 13:30:03 2017 +0000 |
tree | 370e4a48c6e88dee1fd3e0bb55cd111c5c1ca8a7 | |
parent | f9b3997a71d46cd8d18683a7227eb6f3711ed41a [diff] | |
parent | 16ec3c30e5bee7c0d016307ff848caa1f237c415 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: 5386943cf2 -s ours am: 16ec3c30e5 -s ours Change-Id: I03cc46fad1b0c82b4ee4d6460f320c278a7fa250