tree 40880ae4df1cc4e241dacde4c6b4ef2c0403322e
parent 93c0c1d0b9a804492f4b08421d40c94528fa5f6c
parent 4d044d6bbf8225eef3fe10e440b78b55cc09682d
author Clay Murphy <claym@google.com> 1513894145 -0800
committer Clay Murphy <claym@google.com> 1513894145 -0800

resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev

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