OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ac53af 61b8955)
am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:44:49 +0000 (21:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:44:49 +0000 (21:44 +0000)
* commit '61b8955c86a9c949888949be91c06fadf04890cb':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3


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