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

This commit is contained in:
The Android Automerger 2013-09-04 06:01:18 -07:00
commit d1eff36fbf

Diff Content Not Available