am a2c23c6e: am 33232d26: Merge "Add UUID property for adapter." into kraken
am a2c23c6e: am 33232d26: Merge "Add UUID property for adapter." into kraken

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