am cef29578: Merge "Change local names for greater clarity." into honeycomb
am cef29578: Merge "Change local names for greater clarity." into honeycomb

* commit 'cef295780ade72a26201c0c92ed2b64fde03a261':
  Change local names for greater clarity.

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