merge in lmp-release history after reset to af55a405c3838bbc6ea64de521e66eab57547f22
authorThe Android Automerger <android-build@google.com>
Wed, 10 Sep 2014 13:11:46 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 10 Sep 2014 13:11:46 +0000 (06:11 -0700)
commitd8086d7581cf3e600dd6a8af1e1c99878bf988f5
treef1aa50af6c184d8a80a1aeae0f002513c9098816
parentaf55a405c3838bbc6ea64de521e66eab57547f22
parent61a7bcf71136491eb5eab80d18fa6ca6bb1b93de
merge in lmp-release history after reset to af55a405c3838bbc6ea64de521e66eab57547f22