OSDN Git Service

Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 May 2017 23:19:51 +0000 (23:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 May 2017 23:19:56 +0000 (23:19 +0000)

Trivial merge