merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-06 08:16:59 -07:00
commit 2b899b04e9

Diff Content Not Available