OSDN Git Service

Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into nyc-mr2-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)
commitb0dc9ed0435f6c67d88d5d3c0a33b2826320e051
tree9208bc44e02d612de66c198ae357501d61cddbfa
parent3f2a1164aefa3d79cab1fd19012b706609c2fa58
parente7c60be83fdf1be2fb90da2d902ebfa2ba685959
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into nyc-mr2-dev

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