OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57e1734 6fce81a)
am 6fce81a6: am 508fedc4: Improvements to manage apps / running services:
authorDianne Hackborn <hackbod@google.com>
Thu, 29 Jul 2010 00:46:32 +0000 (17:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jul 2010 00:46:32 +0000 (17:46 -0700)
Merge commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03'

* commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03':
  Improvements to manage apps / running services:

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help