merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-07 06:00:54 -07:00
commit a514de50dc

Diff Content Not Available