OSDN Git Service

Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-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)
commit2d947206f7bf0c86bdf109ca4bc140871c3d047f
tree26a5643858196c9c9981a25c80b436cc669ed809
parentfb8b2af07ec73b9d629bd37fa41ddc39903c6e74
parent1a68c01ae5b4f4be720a0bc5f02599bb1b2def8a
Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev

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