merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 4 Sep 2013 13:01:54 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 4 Sep 2013 13:01:54 +0000 (06:01 -0700)
commitadaf1ddea6eb8bdd05c46036bb40f92e9a48da8e
tree2aaf2c66c34e1b727df612ba97e7ac7030e15664
parentec96960f2ce6d2aa79bbdc9895909ff11c3bc2b5
parentaee5c8987af622d3e8520ea34ae6058ec07f8dd5
merge in klp-release history after reset to klp-dev