tree 570c06643698abc33f5a5522922c42a76410aa2d
parent ffb34de44539a6bfb32549f8374550a12bc7a240
parent af43cd033c64384c521a9cb1fb68660d7799435c
author Narayan Kamath <narayan@google.com> 1474479684 +0000
committer android-build-merger <android-build-merger@google.com> 1474479684 +0000

resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582
am: af43cd033c  -s ours

Change-Id: Ifd07ba06cecf61ba53af64bae08f0dac679c9e06