am ad64befd: am 296a712e: Merge "Make a field final."
am ad64befd: am 296a712e: Merge "Make a field final."

* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.

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