tree d045ff1202b3f1dd05ee219397d618f5c5cf96e6
parent b525633b5d710c773457ab07d028d9d56cd42fde
parent 3dd3a1ed88fc4f842b4bb37c33d2a18023bbbe39
author Chris Craik <ccraik@google.com> 1496769785 -0700
committer Chris Craik <ccraik@google.com> 1496769785 -0700

resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I30a520d82d87757ea7c8ac75de70f28d89f33939