| commit | 1494327a97880321922c2abb82e83fb3e1f06c93 | [log] [tgz] |
|---|---|---|
| author | Régis Décamps <regisd@google.com> | Thu Aug 21 04:16:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 04:16:00 2014 +0000 |
| tree | 62c102da2128117fb93b217c9bbdde8c825d8c8f | |
| parent | dc56665ce1610b62e25296d72f9ad80e56758173 [diff] | |
| parent | c639f94e8739ee1696537d071573e0d0110c6ee4 [diff] |
am c639f94e: am c609278f: Merge "Allow to paste text or html into a chip" into ub-chips-cranbrook * commit 'c639f94e8739ee1696537d071573e0d0110c6ee4':