Bug 840128 - Android client for Bagheera. r=nalexander