OSDN Git Service

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
commita0276bfc7b1cc0e5538222aad9d38b5b171eb37a
tree26a5643858196c9c9981a25c80b436cc669ed809
parenta14fb25f93094aaadadcfb5964252e1a29f5b01e
parent10f8c984c0d4b075350802cf7a6a071229c01790
Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev

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