OSDN Git Service

Merge "resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp" into oc-dev-plus...
authorRobin Lee <rgl@google.com>
Thu, 30 Mar 2017 16:49:53 +0000 (16:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Mar 2017 16:49:57 +0000 (16:49 +0000)

Trivial merge