tree c2390ed54d758864f79ab5088b174ed8a4a32dac
parent 8781734facdec1bd141578967dbaf79d30c99d3d
parent 29565ce1f9219e66b7fb40063d49d14bb84ba606
author Patrick Tjin <pattjin@google.com> 1462567480 +0000
committer android-build-merger <android-build-merger@google.com> 1462567480 +0000

Merge "msm8974: remove from top level makefile am: 583ecf5ed2 am: 4e3df672cb" into nyc-mr1-dev-plus-aosp
am: 29565ce1f9

* commit '29565ce1f9219e66b7fb40063d49d14bb84ba606':

Change-Id: I94b55079ffde55d639d9ff457681aac72d1a5b68