tree abd790de3008bb98e9446312663916b0d479805a
parent 2e19aa92ed83ac55185890743a417a5f2af1cdfe
parent 23471afe8420a5346709154b081b50959693e0b7
author TreeHugger Robot <treehugger-gerrit@google.com> 1500521367 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500521367 +0000

Merge "resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp