OSDN Git Service

Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)
commit84e21f34187bec9b407cfa92c8a46de305bd6921
tree26a5643858196c9c9981a25c80b436cc669ed809
parent6a445d13bfd525f7b960751ab57b124868f29d5b
parentccc16f92d75a47842145ba3cd32ca4e784bfdf5a
Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev

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