merge in lmp-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394
authorThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 00:12:19 +0000 (17:12 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 00:12:19 +0000 (17:12 -0700)
commit25d1e475e6e9d6120001b53140ed3cdb12e7c204
tree08c64df72f4134a3b6a5fde3492681655a9cce09
parent350074487acb6e5b75cf3149ebe815e060e60394
parent0318e6a9d9ef750ead231a69961726f21626e676
merge in lmp-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394