diff options
| author | Adrian Roos <roosa@google.com> | 2014-05-25 22:07:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-25 22:07:53 +0000 |
| commit | bd57735c6c90669f0e2ff0227df952755df796b4 (patch) | |
| tree | 8d918ac9d66321feeae5730f0ff15235ab51bcc4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2918e9e133de8066ab497a5f8dac1c310c792767 (diff) | |
| parent | 7d7090d66692170b0584a5b9f4fe3e47285ee615 (diff) | |
am 47dda7ee: (-s ours) DO NOT MERGE Only send notification activity intents after dismissing Keyguard
* commit '47dda7eeeaeaa4ef6e49af88c43559e5036c8d99':
DO NOT MERGE Only send notification activity intents after dismissing Keyguard
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions