commit | 5e221bb9d1ef708ce371e2776b59b03cd239ab8e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 21 19:19:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 19:19:52 2017 +0000 |
tree | 12dcd799a2714613072bcad84101ffa909db1cb0 | |
parent | f8ed8e4ce0af4576c77fec8aab7230372a4c606f [diff] | |
parent | 2e1f39300b07cea2d2ebb722e3658934e93cbd88 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c169459bbd -s ours am: 2e1f39300b -s ours Change-Id: Ib5fad4c1470233853e59b535d6761a0538d57cbb