summaryrefslogtreecommitdiffstats
path: root/core/jni/android_app_NativeActivity.cpp
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-04-01 15:11:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-01 15:11:31 +0000
commitda7ff92c48d02400e76ed1ea44c7de19b3079e97 (patch)
treee0ddb53cfc3962720bcfdc5c73aefe026d715ad6 /core/jni/android_app_NativeActivity.cpp
parente306d785235cf6a9f007170c07dc37ad61733523 (diff)
parentdf42723d6b717fd2882c98c930a0f93c75af2474 (diff)
downloadframeworks_base-da7ff92c48d02400e76ed1ea44c7de19b3079e97.zip
frameworks_base-da7ff92c48d02400e76ed1ea44c7de19b3079e97.tar.gz
frameworks_base-da7ff92c48d02400e76ed1ea44c7de19b3079e97.tar.bz2
am df42723d: Merge "Don\'t double prompt on booting encrypted device"
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474': Don't double prompt on booting encrypted device
Diffstat (limited to 'core/jni/android_app_NativeActivity.cpp')
0 files changed, 0 insertions, 0 deletions