merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-05 06:01:34 -07:00
commit a2a0651f1c

Diff Content Not Available