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

This commit is contained in:
The Android Automerger 2013-10-10 06:00:28 -07:00
commit 671f10390d

Diff Content Not Available