From 8efde54ebc965f047a8958c894c1003b7fc369a1 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Fri, 10 Jul 2015 23:31:47 -0700
Subject: [PATCH] Merge branch 'android_branch', remote branch
 'origin/android_branch' into android_branch