Commit f0917605 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Fix initialization of field after conflicting merges." 

am: 9b863613

* commit '9b863613':
  Fix initialization of field after conflicting merges.

Change-Id: I20200db7e27f63dbdbe4d6cffeebd387624bd40f
parents 590d968e 9b863613
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