OSDN Git Service

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)
commit11c37d01f739fca09fa82e76e195ed135c0f64a3
treea2807258d6635b50fad8ffc458516f8892080657
parent7b9a09d8d2444070404ccd5452cc923f1277618e
parent6f592802065945c79691389ff0e89ebc299260ea
Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582
  Import translations. DO NOT MERGE