merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-05 06:00:46 -07:00
commit 1714c787b6

Diff Content Not Available