merge in klp-release history after reset to master

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

Diff content is not available