am 2a67e1a6: Merge "Remove aliasing"
am 2a67e1a6: Merge "Remove aliasing"

* commit '2a67e1a6c037ea170958da754a1c8a5d4375ac06':
  Remove aliasing

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