OSDN Git Service

Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into nyc-mr2-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
commit555d0062a4314e4a2a5c203c359c1d10e267d836
tree9208bc44e02d612de66c198ae357501d61cddbfa
parente2b68e8cfbf2716c552620a1d1ffea6c90c73b8e
parent913239f688422acb4138e8545368ce39d8868e13
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
  Import translations. DO NOT MERGE