Yuichi Araki ba00002ac7 am d61aeb86: am 0a9a4969: Merge "Revert "Revert "Use RecyclerView for NavigationView""" into mnc-ub-dev ...

* commit 'd61aeb862e2b28885707764c7cc0d40b6f0afd73':
  Revert "Revert "Use RecyclerView for NavigationView""

GitOrigin-RevId=4fd88c3c412d4ce7c34a2a295eeac2cf50825e43

PiperOrigin-RevId: 140550012

2016-12-12 15:38:35 -08:00

..

attrs.xml

am d61aeb86: am 0a9a4969: Merge "Revert "Revert "Use RecyclerView for NavigationView""" into mnc-ub-dev

2016-12-12 15:38:35 -08:00

colors.xml

am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev

2016-12-09 18:21:16 -08:00

config.xml

am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev

2016-12-09 18:21:16 -08:00

dimens.xml

am 2d53b446: am 9c1a007d: Merge "TabLayout measure performance improvements" into mnc-ub-dev

2016-12-12 15:37:45 -08:00

ids.xml

resolved conflicts for merge of 73a0c3c7 to master

2016-12-09 18:13:19 -08:00

strings.xml

resolved conflicts for merge of 73a0c3c7 to master

2016-12-09 18:13:19 -08:00

styles.xml

am a568e389: am 3a132609: Merge "Update TabLayout to Material Spec" into mnc-ub-dev

2016-12-12 15:37:24 -08:00