merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Mon, 18 Aug 2014 13:11:01 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 18 Aug 2014 13:11:01 +0000 (06:11 -0700)
commit17ba016cdad80179d8fc209e04ae8888b834aba4
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parent92fed13a32d11c1e62ab773789d381dcc92e1763
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381