tree c140accb3d3a45ae74367baa94358d7f0091d2b7
parent 6a505f7ce1df18476d16e163e53a216e629f0259
parent 8a094116b1a2b5478945116c1c5c07bba1810aa5
author Ian Elliott <ianelliott@google.com> 1500325503 -0600
committer Ian Elliott <ianelliott@google.com> 1500325503 -0600

resolve merge conflicts of 8a094116b to stage-aosp-master

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