tree 723fd6a8a85dfeabf84b03c5861994ab5a9c81a5
parent 3e0936d1f87d2764390bcb4d80bec1e12c6a3767
parent b10d1c652d0416c284d9792fc9a0a92b3acd51ca
author Kevin Lin <linkevin@google.com> 1390604227 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390604227 -0800

am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout

* commit '2b080e1e1e24a2096fea375d825aa19089fa3e32':
  Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout