tree e58fe2365c16d987ba6e7532382500075fb9aa4f
parent 450c8ec715d83ce7e8b0c360703bf86fc25cee5f
parent c609278f2650f8d74ff9c2e3b1546813560438d4
author Régis Décamps <regisd@google.com> 1408093188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408093188 +0000

am c609278f: Merge "Allow to paste text or html into a chip" into ub-chips-cranbrook

* commit 'c609278f2650f8d74ff9c2e3b1546813560438d4':
  Allow to paste text or html into a chip