am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread

Merge commit '7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp

* commit '7280f2155c37b00359c3fb050e2b067dcd74db40':
  Manually revert a single-line error inserted by OpenJDK.

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