merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-26 07:08:39 -07:00
commit 437f486e01

Diff Content Not Available