Commit b6a74d8f authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Fix initialization of field after conflicting merges. 

bug:27865109

(cherry picked from commit ba6aae0b)

Change-Id: Ia2a0cac929070a02bfbf3ed3eb0a30fc33aba46d
parent bb11c8b1
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