merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 14 Oct 2013 02:20:32 +0000 (19:20 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 14 Oct 2013 02:20:32 +0000 (19:20 -0700)
commit640cb7e91fce37e910da8e46a83bbeaf5738abcc
tree0eacefa94a2ee2a5e0edb00f55808799afb451d3
parent76e1ee73bd112e78361e659dc97afb01ed9c7ca0
parent5a6b7bd85e2e51ac9e772d1bfa338da037f90b70
merge in klp-release history after reset to klp-dev