commit | 2b37b43821f1d2cad57f5393be61ab29b87e5468 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Mar 30 02:01:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Mar 30 02:01:15 2017 +0000 |
tree | 545717b46990468778b43322172659a72dc3da4b | |
parent | 959eda999404aad66bcf923215ad9dffb50d1cf5 [diff] | |
parent | 92547f4b39bbec4e2fc13c26ab67a77b22fca616 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: a53f8a9128 -s ours am: 92547f4b39 -s ours Change-Id: Ib98981df6ecefe159ea9b394e29ed8c94d19475c