tree 40880ae4df1cc4e241dacde4c6b4ef2c0403322e
parent d30eb719690af371d7ea96f0eec04eab0cef16c9
parent dd18bb37c6121c733993ca1e545451d3391f3095
author Clay Murphy <claym@google.com> 1513895123 +0000
committer android-build-merger <android-build-merger@google.com> 1513895123 +0000

resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev
am: dd18bb37c6

Change-Id: I6280dab076cd8c99a682333abfdbc614a7336d6f