OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13d7c56 a9ac2a4)
am a9ac2a46: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 19:49:00 +0000 (12:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Sep 2012 19:49:00 +0000 (12:49 -0700)
* commit 'a9ac2a46d1c718cfbe5e15bb1ad78217e236417f':
  Fix NPE in DeviceInfoSettings
  Fix a crash in InstalledAppDetails
  Tweaking mechanism for adding keyguard widgets
  Fix issue #7178865: Selecting an app from Settings > Apps>...
  Must initialize the new atomic..
  Fix crash in Settings > Security


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help