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

This commit is contained in:
The Android Automerger 2013-09-17 21:11:23 -07:00
commit 3134a0bb18

Diff Content Not Available