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

This commit is contained in:
The Android Automerger 2013-10-09 06:02:11 -07:00
commit 19ebdadee4

Diff Content Not Available