commit | 2bb516078fef3ff6eb9f80afedfbe481bad56221 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Sep 21 16:33:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 21 16:33:49 2017 +0000 |
tree | 387129c8415323ded1183db8a5148f89d138e3c7 | |
parent | 60e051b76db28d2e2b5c985b137e60a12c6015cb [diff] | |
parent | d66c1a54f45142b22ec6668fb011c5b0a0fcfd1a [diff] |
Merge "Import translations. DO NOT MERGE am: 50e19c566e -s ours am: e708378dc9 -s ours am: 05d82e887a -s ours" into oc-mr1-dev-plus-aosp am: d66c1a54f4 -s ours Change-Id: Id98cbb9662821b45777d37a1dbf0921ddff45e6b