OSDN Git Service

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)
commitbc7da75f8765d9cec03ef4b142e3739f486612d5
tree05c3f64527833b5b61c5c8f6212b5123a31aded7
parentcff099466e15ef1dcfeb77a756b6852af5e37f0c
parentc9590c8fc1cc514793cff35970d1c1a37cdf2ec0
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
  Import translations. DO NOT MERGE