OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6816994 4c5eaae)
am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authen...
authorRubin Xu <rubinxu@google.com>
Fri, 12 Jun 2015 16:40:29 +0000 (16:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Jun 2015 16:40:29 +0000 (16:40 +0000)
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
  Defensively load untrusted icons from account authenticator


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