OSDN Git Service

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)
commitdd05e2d93233548759b3f603a275f149820eeff6
treeac837fe5889484c5ff814e3118bc972859433be5
parent42e8a0c2de377acb7692637bf3a7b54327629343
parent023ae30cdd4bf417de1f5a54b03a8890de1953df
Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd
  Import translations. DO NOT MERGE