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

This commit is contained in:
The Android Automerger 2013-08-14 06:06:17 -07:00
commit 7e3060071a

Diff Content Not Available