merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 11 Sep 2013 13:01:21 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 11 Sep 2013 13:01:21 +0000 (06:01 -0700)
commit8a86eaca9d82d8c2fe464fcda9fc033a5f598c7d
tree4e0ed8a5e7bf298ebd54119714f609082e12dc19
parent1aad6c663ee188b02449e5e4d3e40e5c09c8fc14
parent40d26e2c5531cf2598171320d88af2b8d13e8370
merge in klp-release history after reset to klp-dev