Merge "Guard aginst another NPE" into rvc-qpr-dev

packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java

@@ -176,6 +176,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
         }
     }
 
+    @Override
+    public void endFakeDrag() {
+        try {
+            super.endFakeDrag();
+        } catch (NullPointerException e) {
+            // Not sure what's going on. Let's log it
+            Log.e(TAG, "endFakeDrag called without velocityTracker", e);
+        }
+    }
+
     @Override
     public void computeScroll() {
         if (!mScroller.isFinished() && mScroller.computeScrollOffset()) {