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