diff options
author | Jim Miller <jaggies@google.com> | 2013-11-14 15:49:19 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 15:49:19 -0800 |
commit | 29d1201dbd8ddaf7b84e53be78b5db564abc8204 (patch) | |
tree | 8c6daed1c1b7f02df26bd43699442301ec8417ec /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 63e1883d96d635ce7085c46c8a29af34d521076a (diff) | |
parent | dab5ba58fe51c4e800c704a698cd3b9a4e47c7c1 (diff) |
am dab5ba58: am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
* commit 'dab5ba58fe51c4e800c704a698cd3b9a4e47c7c1':
Don't show keyguard until the device has been provisioned.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions