Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev

author Daniel Sandler <dsandler@android.com>

Tue, 23 Oct 2012 15:34:55 +0000 (08:34 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 23 Oct 2012 15:34:57 +0000 (08:34 -0700)
author Daniel Sandler <dsandler@android.com>
Tue, 23 Oct 2012 15:34:55 +0000 (08:34 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 Oct 2012 15:34:57 +0000 (08:34 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Daniel Sandler <dsandler@android.com>
	Tue, 23 Oct 2012 15:34:55 +0000 (08:34 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 Oct 2012 15:34:57 +0000 (08:34 -0700)