merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-17 06:00:13 -07:00
commit 0976c97fe4

Diff Content Not Available