am fe686ee3: Merge "Bug: 17517371: Stop using custom action label in chips" into ub-chips-cranbrook

* commit 'fe686ee34d9d881a13a5f958583abeb66ba4c47c':
  Bug: 17517371: Stop using custom action label in chips
tree: 3bf741a009bdbc8f1bde20fbfadf90ecb1855f64
  1. res/
  2. sample/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. project.properties