tree c37ef4fa3370991550f35e04eb5bb6d25dab03ee
parent a6de8f20c7174232256b9f94d091dfdfb2e7ddbe
parent 0777ad8253ef0423c19874a31c8c43ca82f55314
author David Christie <dnchrist@google.com> 1472078019 +0000
committer android-build-merger <android-build-merger@google.com> 1472078019 +0000

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
am: 0777ad8253

Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51