OSDN Git Service

Merge "resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 14 Sep 2017 09:59:39 +0000 (09:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Sep 2017 09:59:39 +0000 (09:59 +0000)
commitb840785100e220e5fbe2963ace5e4a65cac919ee
treeccf45a713bcf125830b8d4595f5ba1b86eeb30c6
parent3a321910fad57de04874aec8db146d7679664801
parent8f4eab2fccbc333604f1d248dac9a736db96bc6b
Merge "resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp