merge in lmp-release history after reset to 60cf53ddd088ab8ee57d25ae7051bfc2ec8fd71c
authorThe Android Automerger <android-build@google.com>
Thu, 11 Sep 2014 13:13:07 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 11 Sep 2014 13:13:07 +0000 (06:13 -0700)
commit017b930634e4a0c03e927e4ebcc09252d8ee7c76
tree5398c096a402c43bd40292bcc9245665d829c94e
parent60cf53ddd088ab8ee57d25ae7051bfc2ec8fd71c
parentf93ef5f2252953f8ef425d36edd42d60b4e6dbee
merge in lmp-release history after reset to 60cf53ddd088ab8ee57d25ae7051bfc2ec8fd71c