Merge branch 'android_branch' into android_invite
Authored by: eehouse@eehouse.org 2011-08-03
Parents: [294df7][86138e]