am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
  Make ObbActionListener a on-way call