OSDN Git Service

Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-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)
commitea5a5f49cc96a22c9fa2df27e612fea9307ffc91
treeb6a94ec304ea77c9a170ece46d9d5687d0fc7152
parent9ede115c2bbe43beb684d5a8529963ebb177a2d4
parent4bfac588174007941192d1fb1d5471f06d551e22
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev

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