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

This commit is contained in:
The Android Automerger 2013-09-12 06:01:32 -07:00
commit 3002db1c30

Diff Content Not Available