tree 2575a2ac8fc3feb87fe4e128996b76fc88d4704a
parent 49d5582f293dc16fffac67aa7bf9f2c5a7170e79
parent 7d106d5999f8ab960c2a46196715f7c0413816ef
author Narayan Kamath <narayan@google.com> 1474480136 +0000
committer android-build-merger <android-build-merger@google.com> 1474480136 +0000

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

Change-Id: I5657567402cdce858ab88c253ba2badaa062ceca