OSDN Git Service

Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Fri, 28 Sep 2012 22:53:19 +0000 (15:53 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 28 Sep 2012 22:54:44 +0000 (15:54 -0700)
commit3ff8e1a80058e5557d13693d3223e1aa011c0038
tree62d3c43fa2261c2aec17b76f08b7c8cc784c81fc
parent1d3527354396d3aa48b494fb409d680cce32dc8b
parentd4ac8d7b3de27a9f0e4c6af2496ca71d794e42d1
Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev
core/res/AndroidManifest.xml
packages/SystemUI/AndroidManifest.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
policy/src/com/android/internal/policy/impl/GlobalActions.java
services/java/com/android/server/am/ActivityManagerService.java