merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-30 11:08:39 -07:00
commit 1d1fe3bb69

Diff Content Not Available