OSDN Git Service

Merge "resolve merge conflicts of f761f6371a0350bd8d62e97d14cce869a5039572 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 19 Jan 2018 04:58:29 +0000 (04:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Jan 2018 04:58:29 +0000 (04:58 +0000)

Trivial merge