tree 8d9918d169ee096b648b3c32264d22067bf53f4e
parent 15c90b5dee3af45e17bd77a6a82610c23eb9a3a7
parent de7be61a2dfb41c54550a4edcde65721f38d5422
author Steve Paik <spaik@google.com> 1529608842 -0700
committer Steve Paik <spaik@google.com> 1529608842 -0700

resolve merge conflicts of de7be61a2dfb41c54550a4edcde65721f38d5422 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie7032bba7be89a3de65ec300441fc84572e368f2