Skip to content
Commit 1efca130 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2 am: a3658b0f 

am: c9fad766  -s ours

Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1
parents b49e11f7 c9fad766
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment