OSDN Git Service

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)
commit72e16b1754a1c832bdf35abeb7abc36af7e02d95
treea27774933a298ff7de0fcb89d544657b51c208c9
parent6005492cb2799c2e1b6828d31491b7ca3e2fac0a
parenta05627322ff971adee53da31eaf461bbc670a272
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
  Import translations. DO NOT MERGE