| commit | 173bb6c061adc83d3b0157458f356ae4102f86c6 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Jun 10 06:21:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 10 06:21:36 2017 +0000 |
| tree | a4967b041a02a9f7186e5f6efff431f8aaf85fd5 | |
| parent | c3b2fc0691cf52d9afa6bfc5b7783853de7180b0 [diff] | |
| parent | 8314ad1f25380213c273a4039d52ba98ef577bf1 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7c8b1e6832 -s ours am: 8314ad1f25 -s ours Change-Id: Ic2b7e8ee6338c3ed5bf154a14f048cbb86784c61