tree 71bcc7fac42d649692bb4260b9e9b8330776c431
parent 3527c0503f19261dffdb2b4bbd2f2221f5b6b7b8
parent c4383cf1fb7082d23f4b08c5ec693d9ed27d5488
author Mark Salyzyn <salyzyn@google.com> 1484163626 -0800
committer Mark Salyzyn <salyzyn@google.com> 1484163698 -0800

resolve merge conflicts of a45b1d6f3 to master

Test: compile
Bug: 30465923
Change-Id: I648855539df3cfa176c6ecac19b6a562ba6feaf7