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

This commit is contained in:
The Android Automerger 2013-09-02 06:01:13 -07:00
commit 93854bc091

Diff Content Not Available