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

This commit is contained in:
The Android Automerger 2013-08-26 06:01:12 -07:00
commit f78c42a494

Diff Content Not Available