tree 6589a2831784a580a0c93c7bbc89cb541a297344
parent 461773e6a373872bf933b8b7664da3cc386fb546
parent 4f1b2ce365c7e25cf3a07cdbc5154439698fc5c2
author Elliott Hughes <enh@google.com> 1494892803 -0700
committer Elliott Hughes <enh@google.com> 1494892803 -0700

resolve merge conflicts of 4f1b2ce to oc-dev-plus-aosp

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