commit | 311fa22ecb120df7f844864ff0b1265892a78f3d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Oct 11 20:17:36 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 20:17:36 2017 +0000 |
tree | 63eaccec4416fe28ee42d3659c9f65f4ed93d09c | |
parent | c59fcd86c6d81e30839877c34a60664866f9a229 [diff] | |
parent | 1018a5d4a198fa32be018f9c7d10d72142c9a6b3 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours Change-Id: Iee62f36c79ce3056bf3b100251bd78e760655718