Updated for Android SDK 19