diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-11 15:37:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 15:37:06 -0700 |
| commit | b243f791d61f673abddc427e6733c4e63ba1f79f (patch) | |
| tree | 6c9e96c159866e474892f994385c4ff3cd39032d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b8675f2dd94022f359994daf20df93badbefe2f (diff) | |
| parent | 799f031a64d3930b85b9232bac344b1f9f216717 (diff) | |
am 799f031a: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '799f031a64d3930b85b9232bac344b1f9f216717':
Import translations. DO NOT MERGE
Do not allow 0 or smaller periodicity for syncs. b/9295383
Save Notification large icon to extras.
Workaround possible use after delete
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
Don't orphan footers with transient state Bug #8725945
Avoid logging sensitive data.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions