OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8055195 63761a2)
am 63761a2d: am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdMan...
authorDave Platt <dplatt@google.com>
Tue, 4 Mar 2014 23:58:18 +0000 (15:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Mar 2014 23:58:18 +0000 (15:58 -0800)
* commit '63761a2d79d1ba751bf35a0a78d68337a64cac9c':
  Harden NsdManager against null-dereference crashes


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help