merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-08 06:00:55 -07:00
commit 0c7461b72b

Diff Content Not Available