diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-08-19 02:22:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 02:22:12 +0000 |
| commit | 90c68f2a24560b1a78c827fb60a280fdb2e336cb (patch) | |
| tree | 60551e4779f0b48ab4c3c304c773ad7e1d4c33b0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e6cfa30631f2e6650edcc3aa8c46bd58e93fdeee (diff) | |
| parent | 3170650a2b611f175e401634436c650a56d957e9 (diff) | |
am 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '3170650a2b611f175e401634436c650a56d957e9':
Change default cellular activity timeout to 10
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions