merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-24 09:45:41 -07:00
commit d1683047e5

Diff Content Not Available