merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-01 07:08:08 -07:00
commit 2b34432782

Diff Content Not Available