tree cc9a1d532eb61f879efa52fb8882d492edc0aa98
parent cfb45bd7b9a8537e5e7ffa4b78d5cb3aebd4daad
parent 9ca6bac1996e2210f35202b0d05738e8d0d951c0
author Matt Sarett <msarett@google.com> 1463702849 +0000
committer android-build-merger <android-build-merger@google.com> 1463702849 +0000

resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: bd43d7e92b
am: 9ca6bac199

* commit '9ca6bac1996e2210f35202b0d05738e8d0d951c0':

Change-Id: I965414ad387bffd703e8c3bedc523beee43456c4