diff options
author | Steve Moyer <smoyer@google.com> | 2014-03-16 17:35:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-16 17:35:30 +0000 |
commit | 9e6bad83608bbe5da07d52c764087496a136ad42 (patch) | |
tree | 8453f62d41d9534b6828e590a3f5c93cbc35511f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 821df858fcc63be8cd7e53e6432a6a17d734412d (diff) | |
parent | adb3a198beb015ac505aecde585f0c8bca3a29e2 (diff) |
am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
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