OSDN Git Service

Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)
commitee97cf22ba1411ac57b31105dd9ac076b33f33f6
treeac837fe5889484c5ff814e3118bc972859433be5
parent13ac18d299186b6732c408b0b746eca8dabf75dd
parent4cd38db343c72930c7e37b18d76c5e36fe800177
Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: dfffd1a532 skipped: b8f08e00fd
  [automerger skipped] Import translations. DO NOT MERGE skipped: dfffd1a532
  Import translations. DO NOT MERGE