Chris Banes 2a81c19a21 resolve merge conflicts of fc349fd483 to master.
Change-Id: I94a731888f74c6b0e9d9af60fe752d2086cb0f77

GitOrigin-RevId=874a5968599b8c53212ff49af5c047b1211b547a

PiperOrigin-RevId: 140559358
2016-12-12 15:44:56 -08:00
Description
Modular and customizable Material Design UI components for Android
Apache-2.0 191 MiB
Languages
Java 99.9%
Kotlin 0.1%