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

This commit is contained in:
The Android Automerger 2013-08-21 06:02:26 -07:00
commit 6e75330814

Diff Content Not Available