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

This commit is contained in:
The Android Automerger 2013-10-15 15:55:41 -07:00
commit 288515bf44

Diff Content Not Available