OSDN Git Service

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
authorBill Yi <byi@google.com>
Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)
commit231719b4d2b0ada5a5f842f90408ea3304b44db6
tree12e5767c92fdd7decef5e3962516659ef740a3e6
parentbfcb8b99a59da6fc4b89b6a4b19d24bc803926b9
parentfde5e09eeb5068516c58005bd573473468921a22
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev

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