diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2014-03-11 17:43:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 17:43:50 +0000 |
| commit | 2e76f5d8a282f4f948f88208e77dc4b3d0ec6634 (patch) | |
| tree | 47ce40c674b6f6336918ca87a338c45058c20fa6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cb5f813bb642e72777643dcd2bcbd92cc2039388 (diff) | |
| parent | 5f683ca80611c3e98c91f631ee05dccf3e7e0227 (diff) | |
am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions