am 7bf6a5c3: Merge "Adds enum value for KEYCODE_ASSIST"
am 7bf6a5c3: Merge "Adds enum value for KEYCODE_ASSIST"

* commit '7bf6a5c3c712b1785cb76d0fecd7b35ad25d4bb2':
  Adds enum value for KEYCODE_ASSIST

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