OSDN Git Service

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)
commitbd9caf4c6f257bea7a5b4e5bb0d2ffa23c830799
treed3581ecd99795b9f13256fb98048409766275feb
parent5b882b9dd79c9d8c036b77e837f0ce8d9832767f
parentdafe5854ddf7a33320f912657eb9e16f4103493f
Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
  Import translations. DO NOT MERGE