am 2efc1447: am 9aaf4e13: am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
am 2efc1447: am 9aaf4e13: am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev

* commit '2efc1447757a77130a6f8d667dea29a6ac6a2589':
  Fix off-by-one issue when removing from Iterator

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