tree c57e54ae53e7d570540f104e0aac9eed9ef5085e
parent b1b5d507cba4b37221016d308dbf9fdd39019108
parent c681771b9797270a9e24c6806cf9bf25efc2283e
author Narayan Kamath <narayan@google.com> 1474479834 +0000
committer android-build-merger <android-build-merger@google.com> 1474479834 +0000

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

Change-Id: I0fb6263aa98124acb03e79b9c102c7ee6d3e94ba