am 25511b75: am 2e04f1a0: Merge "Move dataItemToEntry() off UI thread" into lmp-dev

* commit '25511b75d59a10071b3216c22f1fdd6ec8ac25e3':
  Move dataItemToEntry() off UI thread