am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread
am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread

Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
  Add Blocked Device property.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base