merge in lmp-mr1-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891
authorThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:10:58 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:10:58 +0000 (06:10 -0700)
commitc23ea373078ca0d3bdb36bba3a3ba3eefa5b279a
tree4133b80e817142274fc3dab9cce32e240f257b82
parent3ddaa6ec08d417d2848775ad3b5b01b865a9c891
parent27c958e7c08cba69a52b7ff31b792d87f165c97a
merge in lmp-mr1-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891