merge in lmp-release history after reset to f17dec635141a16b68ab4980c118d49ec5ae11c0
authorThe Android Automerger <android-build@google.com>
Thu, 16 Oct 2014 13:13:09 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 16 Oct 2014 13:13:09 +0000 (06:13 -0700)
commitd22ad5556c2ed318efde090b607410f68b9122eb
tree42a57b40823fb766cbf0ecdb00a1cf186b507824
parentf17dec635141a16b68ab4980c118d49ec5ae11c0
parenta49b5f26d28c70934b0a8961cfa0126af01be14d
merge in lmp-release history after reset to f17dec635141a16b68ab4980c118d49ec5ae11c0