am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev
am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev

* commit '0a63f754e6f192539be16f59bda3839aa5d24641':
  Update the handling of the native bridge 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