merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-16 06:01:26 -07:00
commit cbe3603c41

Diff Content Not Available