tree c31d7f32ecc39dd6b73de85f3e1f2c213acaaffd
parent 91ce2645b6c270fe560266c8bbbc78abfec882a0
parent 7a78e14ec64ad36fd37fe0d8d416df5beff5ba0f
author Dan Albert <danalbert@google.com> 1493234824 -0700
committer Dan Albert <danalbert@google.com> 1493234824 -0700

resolve merge conflicts of 7a78e14ec to oc-dev-plus-aosp

Change-Id: Icdd22fcf328935b7f5647270489539dab0ec4369