Merge "Unregistering listeners according to new API." into pi-dev
am: cf3b1ff58b

Change-Id: I59288af252277d8d55ed0953fe21bb9326767a4b
tree: 693ecb1041d55b6eb8baa4225647331282468007
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg