commit | d0c8083b4bada8e93485cda636cd00c1d738a844 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 21 19:17:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 19:17:58 2017 +0000 |
tree | 15a8d2b1b711c91d5497e7771b2ca157298c2e32 | |
parent | 6f7952e45483acbc3775dac967fa3c6bdce0e96b [diff] | |
parent | ab6d16cf88ac1b1f72fd43d039cc77ca4dca1635 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ce7d21ad2e -s ours am: ab6d16cf88 -s ours Change-Id: I37165f937a36f6a96227733d7581a212befa2507