OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21e0cf9 0347c7e)
am 0347c7e6: (-s ours) am 00108830: am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 22:09:14 +0000 (22:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 22:09:14 +0000 (22:09 +0000)
* commit '0347c7e6384a3561b1b75e1f709b0be6e93be750':
  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