OSDN Git Service

resolved conflicts for merge of ff0978fd to master-lockscreen-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 10 Apr 2014 21:26:13 +0000 (23:26 +0200)
committerJorim Jaggi <jjaggi@google.com>
Thu, 10 Apr 2014 21:34:07 +0000 (23:34 +0200)
commit584a7aa62c54bcbd654a6696d4fbb56e124874e7
tree085c69d131007c3211b472bb5f0fb02f525a9fcd
parenta0b2be85b831394173b210be3879f90d336b4386
parentff0978fd162d1211007c8345bd1ea641fa2b0e33
resolved conflicts for merge of ff0978fd to master-lockscreen-dev

Change-Id: I03881da30db8189005d50812e5528ed07cebd437
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java