merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-06 08:17:35 -07:00
commit accdd16614

Diff Content Not Available