merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 24 Sep 2013 13:01:22 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 24 Sep 2013 13:01:22 +0000 (06:01 -0700)
commitd7e1d2f12ea68a0e4d2e24ddb647e60288ad9b0d
treeb8043a93fda433b25e0a0d6c38df81524db08754
parentd03ee77200600d35e18055b8cea259c613ffcfa1
parent3feb4c1f1732e592f2b3cddf0e0a099699a4e509
merge in klp-release history after reset to klp-dev