am 5857c040: am b142ea00: Handle anonymous sender
Merge "search work."
am 3c6eacd7: merge from open-source master
Stop using private APIs that are going away.

Change-Id: I0aa9b361a03e3e3dcc25c7768fdc5a79a0e89e06
Use JSR-305 thread annotations, and fix a missing lock.

Change-Id: I896a975d03a3607c6fa948e948796fe547cbb959
Merge "Use JSR-305 thread annotations, and fix a missing lock."
Revert I896a975d03a3607c6fa948e948796fe547cbb959 to fix build.

Will re-submit later.

Change-Id: Id9386211d5d54e123db5bb43ed3aca58af8cae4f
Merge "Revert I896a975d03a3607c6fa948e948796fe547cbb959 to fix build."
Use JSR-305 thread annotations, and fix a missing lock.

Change-Id: I74ef136c117b8cdcbca0cab0194f65e5fe1b401c
Merge commit 'ccc3a9219b3e1d1cff5dde3c13ecea1bb06226c3' into oxygen_4.3

* commit 'ccc3a9219b3e1d1cff5dde3c13ecea1bb06226c3':
  Use JSR-305 thread annotations, and fix a missing lock.
  Revert I896a975d03a3607c6fa948e948796fe547cbb959 to fix build.
  Use JSR-305 thread annotations, and fix a missing lock.
  Stop using private APIs that are going away.