OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa64ba5 a351cda)
am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into...
authorJorim Jaggi <jjaggi@google.com>
Tue, 19 May 2015 05:02:24 +0000 (05:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 05:02:24 +0000 (05:02 +0000)
* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException


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