Remove a merge conflict generated on Github
Holy Seaman, batman!

Seaman will load :)

logging changes

trying to hone in on commands going in and out

initial dox

mic device figured out?

i have satisfied seaman.
its just constantly polling for data.
next step: pipe in some audio!

almost working

crashes - need to figure out jni thread crap

oh snap gets further!

jni local reference table overflow

AWWWW YEA

SOMEONE TRY THIS

minor hygiene

progress

-some cleanup
-handling of retransmit
-got rid of needless sleeping in record thread
-some latency handling

Conflicts:
	shell/android/AndroidManifest.xml
notes and manifest tweak

better conformity to spec

merge from master

i hope
This is ready to go

-Added config to input fragment
-Reduced logging
-Init the mic at the right time during startup so that port 2 either
gets vmu or mic
-Has not been tested on device without mic
-Needs more testing in games

grr

managed to add some instability, investigating

its verking!

figured out issue, made mic setup simpler

umm

ok its one of those things where the logging makes it work!
not sure whats up, but without the additional logging it crashes.

learning the hard way

root cause found (i think). lesson: java functions called via jni dont
handle exceptions/tell you what happens when they crash.
Prevent non-mic devices from doing this