merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-22 06:01:47 -07:00
commit 81eca48db5

Diff Content Not Available