am 3a5f2493: am 00e947b5: Remove a line that was accidentally committed.
am 3a5f2493: am 00e947b5: Remove a line that was accidentally committed.

* commit '3a5f24936a9115203ba2661ce8be2a6ba49fd1e1':
  Remove a line that was accidentally committed.

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