tree e724274a0a8bf88fc032ad88c7f5515227cd3de0
parent f2fa27393c59ec00cd4057e5ef2514dbfda3611b
parent 4bc9219dee97713d141d76ecb33be358420a1b91
author Mark Salyzyn <salyzyn@google.com> 1496768973 -0700
committer Mark Salyzyn <salyzyn@google.com> 1496769070 -0700

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

Test: I solemnly swear I tested this conflict resolution.
Bug: 37753761
Change-Id: I4898abc8dd63fdfb4c4ca8a6e69a6198c4882cb3