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

This commit is contained in:
The Android Automerger 2013-09-09 06:01:45 -07:00
commit 9509dec1ba

Diff Content Not Available