merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 18 Sep 2013 00:39:56 +0000 (17:39 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 18 Sep 2013 00:39:56 +0000 (17:39 -0700)
commit60785ef1648dd05090b4c837dc0321e0c640f3a3
tree9d4e7d45ac1474dda3fedbac9cf2171fb36fbb45
parent827af0459c7b953d8b5d3928685dcccbcd15883c
parent67cf0ab822c20976ede24612be83f9ba31619e97
merge in klp-release history after reset to klp-dev