Yuichi Araki
2849c69a2b
Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7
...
am: 911b8ca625
* commit '911b8ca625d9be4f532837ebf8a4e144f339514c':
BottomSheetDialog and BottomSheetDialogFragment
GitOrigin-RevId=7e1cd0b84ec4f183be9cc5025960724092f2cae4
PiperOrigin-RevId: 140559377
2016-12-12 15:45:04 -08:00
Chris Banes
d2162a238b
Merge "Fixes for TextInputLayout" into mnc-ub-dev am: 5db2eb25a6
...
am: 1111ad31e6
* commit '1111ad31e6cefffd8a14d7fa4724a14d47112a92':
Fixes for TextInputLayout
GitOrigin-RevId=ae8119e4d4d6afe1ec07819715f31c0a57a71e4a
PiperOrigin-RevId: 140551230
2016-12-12 15:42:16 -08:00
Yuichi Araki
6e3b920cc1
am c14d808e: am 0e245015: Merge "Add support for character counter" into mnc-ub-dev
...
* commit 'c14d808e6c599ea34990583359ef1d4c4c1640b0':
Add support for character counter
GitOrigin-RevId=7a91a5d0a7de9fc24d0ca45dfdad96761a2f0200
PiperOrigin-RevId: 140550112
2016-12-12 15:38:55 -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
