summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Dave Platt <dplatt@google.com> 2014-03-04 22:02:55 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-04 22:02:55 +0000
commitf08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca (patch)
tree39ed0f83fb2dd80ac3fdff410265096ebd08d567 /opengl/java
parent11c51608ee1c368dd38b134603e85943629c6f44 (diff)
parent7d8262cb554c41892794f23b92e01b52458288bb (diff)
am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '7d8262cb554c41892794f23b92e01b52458288bb': Harden NsdManager against null-dereference crashes
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions