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

This commit is contained in:
The Android Automerger 2013-09-17 06:01:01 -07:00
commit 92d16bd3ee

Diff Content Not Available