merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Mon, 11 Aug 2014 06:16:17 +0000 (06:16 +0000)
committerThe Android Automerger <android-build@google.com>
Mon, 11 Aug 2014 06:16:17 +0000 (06:16 +0000)
commitffb7a9676fb740b844e6a65e56c8feb89f427d99
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parent0cb17630979fd93fb3f1308531522ec2074d06f7
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381