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

This commit is contained in:
The Android Automerger 2013-10-06 06:01:27 -07:00
commit 38234af6bd

Diff Content Not Available