OSDN Git Service

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)
commit836d1db23982975f7850abd944ae59b1af0b7393
treed3581ecd99795b9f13256fb98048409766275feb
parent3bbe3c7c93814bbbb9f2bf10014a3f1e4b3c185f
parent6d301239999fdbd02b57a9e9fafb67e6080d5de3
Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
  Import translations. DO NOT MERGE