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

This commit is contained in:
The Android Automerger 2013-08-27 06:00:58 -07:00
commit da4bedf52f

Diff Content Not Available