commit | c8c242379a87347d18cbe01fe111513163a72925 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 13:30:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 13:30:51 2017 +0000 |
tree | 370e4a48c6e88dee1fd3e0bb55cd111c5c1ca8a7 | |
parent | a90c3c8948c678b92fafffe30bf393ff911ea769 [diff] | |
parent | 995b3898c43483b35837cc338fe022b5d8ea3c4d [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27 -s ours am: 995b3898c4 -s ours Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0