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

* commit '4d0425d48a54b684d7c1af824b14b3bdf0cfa4ce':
  Ensure delete listener is set for chips
tree: c3c228caf40cde2eed3553e21a101c75397e9345
  1. res/
  2. sample/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. project.properties