merge in lmp-release history after reset to c187e073823cc4d9c86b536617ea0d198d14755e
authorThe Android Automerger <android-build@google.com>
Wed, 1 Oct 2014 13:18:21 +0000 (06:18 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 1 Oct 2014 13:18:21 +0000 (06:18 -0700)
commitfb015e8b595620f5a7046476def5b08bda6f265b
tree1379e8ff7e2f2ee3b78a0b6f3a22a4a0a4a6523d
parentc187e073823cc4d9c86b536617ea0d198d14755e
parentc587b37bd3fb022e73eebaa22fe85544d4c545e0
merge in lmp-release history after reset to c187e073823cc4d9c86b536617ea0d198d14755e