merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 10 Sep 2013 21:29:13 +0000 (14:29 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 10 Sep 2013 21:29:13 +0000 (14:29 -0700)
commit40d26e2c5531cf2598171320d88af2b8d13e8370
treecb691c0a0b7a2f2f5c894d940d45a226e1e510a6
parent5a0bf765ff2ede5d964d7a1632d588d12c2ba0f7
parentbac6b253ac6f9fbd28e6db05b69767b10e745133
merge in klp-release history after reset to klp-dev