Chris Banes
b693c62b6e
am c6fccd68: am e667a567: Merge "Use the correct interpolators in the design lib" into mnc-ub-dev
...
* commit 'c6fccd6842d28bdedea425ab1e0c947e2e1a41bc':
Use the correct interpolators in the design lib
GitOrigin-RevId=eda4412df4b985c54913b1ba9dff1ce4d4883cf5
PiperOrigin-RevId: 140550492
2016-12-12 15:40:34 -08:00
Chris Banes
83e56599cd
resolved conflicts for merge of 73a0c3c7 to master
...
Change-Id: I1652150b1499db455f1eee8d8743d2f7f7bb6fcc
GitOrigin-RevId=c005695ca3e01efb3c3486f5cb6bf1e7fb21995c
PiperOrigin-RevId: 140545763
2016-12-09 18:13:19 -08:00
Chris Banes
dd946bba2e
am d972c3ba: am d421b2b3: am f4e0b1dd: Merge "TextInputLayout - a wrapper around EditText" into lmp-mr1-ub-dev
...
* commit 'd972c3ba1979b8d3710f537de162c362fde0ea30':
TextInputLayout - a wrapper around EditText
GitOrigin-RevId=809f652c46ec74ffea3505725e577d680a5f47ab
PiperOrigin-RevId: 140545480
2016-12-09 18:12:14 -08:00
