tree 8e442acb85625647d0c6566a5a542ce39c210009
parent 6a75b1698f0cf5c0f36e3db09bbafb5d9f9e1df4
parent 6af9cdf137c4fd907c0a612b47996c906416d8db
author Jeff Sharkey <jsharkey@android.com> 1536766886 -0600
committer Jeff Sharkey <jsharkey@android.com> 1536766886 -0600

resolve merge conflicts of 6af9cdf137c4fd907c0a612b47996c906416d8db to master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c0e977b7d7c32ee9515e184ac7ac998f6b05c