am 92393d85: Merge "Update nomenclature." into jb-mr2-dev
am 92393d85: Merge "Update nomenclature." into jb-mr2-dev

* commit '92393d8518604eab9a1edfbcf8f0329ffeee46e7':
  Update nomenclature.

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