merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 2 Oct 2013 13:01:46 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 2 Oct 2013 13:01:46 +0000 (06:01 -0700)
commit05a4864b8273ae2ae7bb62a4f0a76c8c1e17f722
tree226c8284cc317df5ee05771349b6d24578035f96
parent04c1c2afb7481e7fb9b66f96023c79d19cad8c90
parent47f6386b7fa9d8c8fbd2725e6e009e6d2dddc9d4
merge in klp-release history after reset to klp-dev