OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff66c00 5e76bf9)
Fix merge conflict for 'c2e1e329'.
authorDan Morrill <morrildl@google.com>
Mon, 13 Jun 2011 18:59:38 +0000 (11:59 -0700)
committerDan Morrill <morrildl@google.com>
Mon, 13 Jun 2011 18:59:38 +0000 (11:59 -0700)
Conflicts:
core/res/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help