merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 9 Sep 2013 13:02:43 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 9 Sep 2013 13:02:43 +0000 (06:02 -0700)
commitbac6b253ac6f9fbd28e6db05b69767b10e745133
tree4b7361352f28e1d7d20fb2affe773cad5da0a976
parent3c03d1b8b7d96209d7b83b6881421ddfc17ccc52
parentadaf1ddea6eb8bdd05c46036bb40f92e9a48da8e
merge in klp-release history after reset to klp-dev