am 22152a68: Merge "No need to check a wp<> for 0 before promote()"
am 22152a68: Merge "No need to check a wp<> for 0 before promote()"

* commit '22152a68071409a616b031f79c4fec73abc9508a':
  No need to check a wp<> for 0 before promote()

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