Buffer for Android beta

by Matt Woodfield