OSDN Git Service

Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 15 Jun 2017 19:42:47 +0000 (19:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Jun 2017 19:42:53 +0000 (19:42 +0000)
commit797fdc445024f402a5b82860c1044906fc0d0cbf
treea395adb2e30438dfaaac73573f641dfe5ca9492a
parent5618d79349b5b51063357763fbe694b7c52da663
parentdb8870065ad706e9ea66520879da9a3fa82ec6ae
Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp