am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."

* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
  Fix warning introduced by recent psuedolocalizer change.

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