Android client production code

Wow, how did we miss it!?