merge in lmp-release history after reset to 536cae75031e11ee30da0a0b4d4a0752e5526e96
authorThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:16:03 +0000 (06:16 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:16:03 +0000 (06:16 -0700)
commit2cb70152d44df99d0115b99b91d73c23c944aaad
tree267e3fd9844dfad0a09960eab928e969be060b6f
parent536cae75031e11ee30da0a0b4d4a0752e5526e96
parent5d9e969749f8f1149c8b7960ab7be9264b0d605d
merge in lmp-release history after reset to 536cae75031e11ee30da0a0b4d4a0752e5526e96