tree a395adb2e30438dfaaac73573f641dfe5ca9492a
parent 5618d79349b5b51063357763fbe694b7c52da663
parent db8870065ad706e9ea66520879da9a3fa82ec6ae
author TreeHugger Robot <treehugger-gerrit@google.com> 1497555767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497555773 +0000

Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp