[automerger skipped] Merge "Inline slider with header" into pi-dev am: 666ee4fa14
am: dc001563ae -s ours
Change-Id: I57208dd70a098e15792b339ea6353ee218ab67eb
This commit is contained in:
666ee4fa14
am: dc001563ae -s ours
Change-Id: I57208dd70a098e15792b339ea6353ee218ab67eb