tree 971bc66232a8ebb3cf04238338fb43cab0ba9dc8
parent 5f41003d1f270bd56a451b8a1a0426fc2643bd1e
parent a45b1d6f38047760bf206889517cc43c012d1317
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