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

This commit is contained in:
The Android Automerger 2013-10-02 06:01:21 -07:00
commit a43de4744e

Diff content is not available