merge in lmp-release history after reset to f3f4604ff4cbb10219e9b5f7729d2146a69a6363
authorThe Android Automerger <android-build@google.com>
Wed, 24 Sep 2014 13:16:12 +0000 (06:16 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 24 Sep 2014 13:16:12 +0000 (06:16 -0700)
commit0682e17ad1525bc9dce0c2bd771a187b924cd89c
treeb660c3e8f74a6f18f48ca0fa84f1f62600ed3d6e
parentf3f4604ff4cbb10219e9b5f7729d2146a69a6363
parent098f175d55bcc6cdea6e0ad044156f51ddda3271
merge in lmp-release history after reset to f3f4604ff4cbb10219e9b5f7729d2146a69a6363