am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"

* commit '69b4670730ec557af6dc67f6c42aff20e5b0b86a':
  Parse UUID string with Long.parseLong

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