merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 29 Aug 2013 13:01:34 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 29 Aug 2013 13:01:34 +0000 (06:01 -0700)
commite281ec42d750515458d12cc9a625b2bbfbc279d8
tree3101ef59a9348785e8e961692c6d903794ec9fae
parentec62bdf20cbfa709c9dea9101fe668fec315c103
parentdf76219fdac9f1114c46382b348281222add2394
merge in klp-release history after reset to klp-dev