OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71c915b 9b78ee9)
am 9b78ee91: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Jun 2013 14:20:14 +0000 (07:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Jun 2013 14:20:14 +0000 (07:20 -0700)
* commit '9b78ee911303a9b9564f7225d02c0193f02b6aba':
  Fix NullPointerException at RunningState


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