OSDN Git Service

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)
commit806b4573aa4d663a6a603b82034bfaa8c3f271d2
treea2807258d6635b50fad8ffc458516f8892080657
parent41ae4b7eae7e1844e70c282eed02471f8d83fb9d
parent0a09cd4b21cf3c72b463ee2968d740c35a4ff7c7
Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01
  Import translations. DO NOT MERGE