Instead of stopping the entire merge process, I went ahead and hacked
away the few lines that failed to compile. Someone familiar with the
code in question will need to restore the appropriate functionality.
JBQ
--
Jean-Baptiste M. "JBQ" Queru
Software Engineer, Android Open-Source Project, Google.
Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.