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

This commit is contained in:
The Android Automerger 2013-08-22 06:01:19 -07:00
commit a574a99b43

Diff Content Not Available