merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-31 06:01:38 -07:00
commit 3901476dc1

Diff Content Not Available