merge in lmp-release history after reset to bd06406dceb430cca32ae2aa195fbf37b10d58b0
authorThe Android Automerger <android-build@google.com>
Mon, 25 Aug 2014 13:12:36 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 25 Aug 2014 13:12:36 +0000 (06:12 -0700)
commit55ca8d150429ab2b7423f2a6ebbfb781e5227139
tree579567308eb51fe64af6516fb6dd014e83e321d2
parentbd06406dceb430cca32ae2aa195fbf37b10d58b0
parente11c63be0a9b3dbe15b2ac44d5b861544f4f5786
merge in lmp-release history after reset to bd06406dceb430cca32ae2aa195fbf37b10d58b0