diff options
| author | Steve Moyer <smoyer@google.com> | 2014-03-16 17:37:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-16 17:37:55 +0000 |
| commit | 9f2b21792e7b25dbb2d94fd8d07c881a46c467e4 (patch) | |
| tree | 14a628cbe8569404b1f2bfbcfb7d7ebabafa106a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f207ec76a51c96a72b7d972636dfa8f9e658fc92 (diff) | |
| parent | 9e6bad83608bbe5da07d52c764087496a136ad42 (diff) | |
am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '9e6bad83608bbe5da07d52c764087496a136ad42':
Don't attempt to launch disabled activities in smoke test.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions