Commit 299a9ff9 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "fix a null pointer dereference" am: dc8d7b63 am: 0fb45058 am: ec040570 

am: 8e1023b0

Change-Id: I19ec45046cd551e1dc5d1972425d6859de2c7dc8
parents e52a342e 8e1023b0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment