OSDN Git Service

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)
commitf310c792d46f96c0658c93fb21f6688eb1e4cac8
treea2807258d6635b50fad8ffc458516f8892080657
parent806b4573aa4d663a6a603b82034bfaa8c3f271d2
parent8eb39fb0f480e31c79e7a8e4f7a59c9e4f1952b0
Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18
  Import translations. DO NOT MERGE