am eaa20b5c: am 4d0425d4: Merge "Ensure delete listener is set for chips" into ub-chips-cranbrook

* commit 'eaa20b5c0a0f732f61bca2fe3f56618ccf46fdd9':
tree: 62c102da2128117fb93b217c9bbdde8c825d8c8f
  1. res/
  2. sample/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. project.properties