merge in klp-release history after reset to klp-dev

This commit is contained in:
The Android Automerger 2013-08-15 06:01:06 -07:00
commit 99ad75d5a8

Diff Content Not Available