merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-30 11:10:08 -07:00
commit 478a3f1ff9

Diff Content Not Available