merge in klp-release history after reset to klp-dev

This commit is contained in:
The Android Automerger 2013-09-09 06:01:43 -07:00
commit 77ca71cce5

Diff content is not available