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

This commit is contained in:
The Android Automerger 2013-10-13 06:02:02 -07:00
commit 26ef413c59

Diff Content Not Available