From 20e84c750f7ef783344f9890764906e20b0df822 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Tue, 19 Apr 2016 09:47:20 -0700
Subject: [PATCH] Fixed a rebase gone wrong with pageindicator

The return statement was lost.

Change-Id: Ica403337bf9dce2c0b1c2447a0aa4359f991ac0d
Fixes: 27927374
---
 packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
index 9239dedc11237..26da551e8222a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
@@ -122,6 +122,7 @@ public class PageIndicator extends ViewGroup {
         ImageView second = (ImageView) getChildAt(secondIndex);
         if (first == null || second == null) {
             // may happen during reInflation or other weird cases
+            return;
         }
         // Lay the two views on top of each other.
         second.setTranslationX(first.getX() - second.getX());