merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 8 Oct 2013 13:00:50 +0000 (06:00 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 8 Oct 2013 13:00:50 +0000 (06:00 -0700)
commitec7a7807741172af981694735bffeef609d32dc4
tree1a6a1121a40d3079c468c0333ccc034a90a9fc86
parent002b8c6f5095a36bd09f2b6de6c4b3e1125c6158
parent129558a324bb68aa237bfd9b70222a78d91c59d4
merge in klp-release history after reset to klp-dev