| commit | da4166849fc6943d6f6e2c328497cd77cd8ff490 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Aug 16 19:11:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 19:11:40 2017 +0000 |
| tree | 2720556dab52129754795b94d3766c2cdb2168a1 | |
| parent | e3d4a14380a1b88fef5c4d2a2431d7864d15b3ee [diff] | |
| parent | 965d21f56b96630fc74f7ad41dff45728a0d7741 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1c40c7077 -s ours am: 965d21f56b -s ours Change-Id: Ia845087061f15295a2f30317f1f5e5d7df6a6cac