am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev

* commit '9e3a900c35d6af749d0c363dadf627384eed687a':
  Revert "Removed symbol causing compile breakage."

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