am 2ff591ff: Merge "Format NaN and Infinity as Doclava expects."
am 2ff591ff: Merge "Format NaN and Infinity as Doclava expects."

* commit '2ff591ffb6cc05e80fb5f353c4b34c7794070c4f':
  Format NaN and Infinity as Doclava expects.

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