diff options
| author | Ashish Sharma <ashishsharma@google.com> | 2012-09-26 13:49:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 13:49:29 -0700 |
| commit | 8b3750e2ce6a4627df751eb239b7b75d390149cc (patch) | |
| tree | b4a9539d245f2f32443034d60980beee0893ae88 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 54ea6bf2aa5e8d72c96f410d87ec96431abe641c (diff) | |
| parent | 404479a98c444e7f47783891e799978a3802a666 (diff) | |
Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions