merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 24 Sep 2013 13:02:00 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 24 Sep 2013 13:02:00 +0000 (06:02 -0700)
commit8d8093bf7549e9c4808d3acf8be38d7f7572560f
treea1ed113bae539117db084f51f579ed78fbd19d3b
parentc067c8be21dc4a6dc5f49b2b1aed7f91aab47063
parent88d0d3fd70bcc5c22fa1faa1418eed75d703276c
merge in klp-release history after reset to klp-dev