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