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

This commit is contained in:
The Android Automerger 2013-08-29 06:01:02 -07:00
commit fa2aaeeabd

Diff Content Not Available