summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/ScriptGroup2.java
diff options
context:
space:
mode:
authorMatthew Williams <mjwilliams@google.com>2015-04-06 21:02:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-06 21:02:05 +0000
commit0d025e10b215a0042ad19e9c6e0af4fe3e745d16 (patch)
treec2dfaacbf0bf0e384a5854da6ad3119d4ffc46ca /rs/java/android/renderscript/ScriptGroup2.java
parent0270d86ab755dabb7d20013dcb591d3facbe1a08 (diff)
parent679572ca969b9bf27786cff2123ec466b9a37222 (diff)
downloadframeworks_base-0d025e10b215a0042ad19e9c6e0af4fe3e745d16.zip
frameworks_base-0d025e10b215a0042ad19e9c6e0af4fe3e745d16.tar.gz
frameworks_base-0d025e10b215a0042ad19e9c6e0af4fe3e745d16.tar.bz2
am 679572ca: am 0b3673c4: am 20baa9d9: am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev
* commit '679572ca969b9bf27786cff2123ec466b9a37222': Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup2.java')
0 files changed, 0 insertions, 0 deletions