merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Tue, 12 Aug 2014 13:11:57 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 12 Aug 2014 13:11:57 +0000 (06:11 -0700)
commit237dfd6b9b0bea31fc9ccd2ef7e00ccb13c86b6d
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parentffb7a9676fb740b844e6a65e56c8feb89f427d99
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381