Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
index 034ecb3..7b21bfc 100644 (file)
--- a/THIRD_PARTY.txt
+++ b/THIRD_PARTY.txt
@@ -59,7 +59,7 @@ The third party software included and used by this project is:
    modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. 
    See https://github.com/MikeOrtiz/TouchImageView
  
- * floatingactionbutton 1.10.0.
+ * floatingactionbutton 1.10.1.
    Copyright (c) 2014 Jerzy Chalupski
    Licensed under Apache License, Version 2.0.
    placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc.