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

This commit is contained in:
The Android Automerger 2013-09-04 06:01:52 -07:00
commit 384f4ece0f

Diff Content Not Available