diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-14 18:28:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 18:28:38 -0800 |
| commit | 167b4ad49f7ea8585fbd9b867872ba4bd41d3335 (patch) | |
| tree | 165fabb5536042cbfbcdd0070ff74a5c0ef6bc7d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1aebcb9b934df59c6722212f5641285f5b80801b (diff) | |
| parent | fa0211adc3a8bcc988f5a886e71aab1459f7435e (diff) | |
am fa0211ad: am 8d1e86d0: am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
* commit 'fa0211adc3a8bcc988f5a886e71aab1459f7435e':
Don't show external presentation until keyguard actually shows
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions