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

This commit is contained in:
The Android Automerger 2013-09-12 06:00:47 -07:00
commit f5927fb8e6

Diff content is not available