OSDN Git Service

Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)
commitd0025407dfb8b601f154c433459abd199f4191ff
tree493de619ff05f9c63ad18a2ce8afa99dc057c91d
parent843fb76d1f9793822690b6a62fbc9496c8917543
parent70ebabc63d084509e6c79429cf9bb87b63fe5eaa
Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637
  [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0
  Import translations. DO NOT MERGE