Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 17:34:08 +0000 (19:34 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 17:34:08 +0000 (19:34 +0200)
commit172767d391b36e1eba6d7c19556b34156007298c
treec7927f46d17c93f03b0c899a75fdc2e94cd5a370
parent267179ef2eeb427d59be82f7ba591fbd2740014d
parent66bae3914cfd07d6e623fecad3e47cf667a137ac
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons