| commit | c639f94e8739ee1696537d071573e0d0110c6ee4 | [log] [tgz] |
|---|---|---|
| author | Régis Décamps <regisd@google.com> | Thu Aug 21 02:57:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 02:57:53 2014 +0000 |
| tree | 9b182c4819a79c185206a5c5b865c9a57752ca65 | |
| parent | 087e3bf036e81ebede4b5ac2a81d79eb7b1eaac6 [diff] | |
| parent | c609278f2650f8d74ff9c2e3b1546813560438d4 [diff] |
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