merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Sun, 13 Oct 2013 13:02:04 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 13 Oct 2013 13:02:04 +0000 (06:02 -0700)
commit5a6b7bd85e2e51ac9e772d1bfa338da037f90b70
tree9c05aed98f876c5a6ca58da20226694c6d8b49a6
parent1260f1c6c909f2940989b72afe1b91fd83845eaa
parentb6ed835ae59b8f7de1add27e67b20ee26b4e18ca
merge in klp-release history after reset to klp-dev