tree d14f03a57b8325172ca4d38b18cefd199ed43023
parent b898481de7f2d3d7617da04a58aa320e58aa72a4
parent bd43d7e92bec3b69f8318d74cd11936a622efef4
author Matt Sarett <msarett@google.com> 1463700856 +0000
committer android-build-merger <android-build-merger@google.com> 1463700856 +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

* commit 'bd43d7e92bec3b69f8318d74cd11936a622efef4':

Change-Id: I4c8ed47e3a5ca4dba3e423332bc6252e9ec92e43