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

This commit is contained in:
The Android Automerger 2013-10-15 06:00:54 -07:00
commit 3bd1b65ffb

Diff Content Not Available