diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-29 22:07:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 22:07:52 +0000 |
| commit | d5f0a116a2b0a6de447df00bfbe91cf66ad4286e (patch) | |
| tree | cddde251a1bbcab8ff67b84074e774943d054ea2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 056fa3b6fdf0a690b52e06fc7e876b35cdfc0164 (diff) | |
| parent | f68e9d834cbc67dd409076f4d574a55f74d566e2 (diff) | |
am aaabf0fc: Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-preview-dev
* commit 'aaabf0fc6ede19c31ea1a33431ca5216fe9bfa9a':
Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions