diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-27 20:34:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 20:34:15 +0000 |
| commit | c2c611c4e5024bc9405cae4c9ffe9d72599f9751 (patch) | |
| tree | 83db18efc76cd4ec9cf945f22b432ce7d2a86fcf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 24d83c1434bd315411c46fb80603ae931000cc82 (diff) | |
| parent | 13ad04e76be2fb34ffc9a039272a82636e215caa (diff) | |
am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '13ad04e76be2fb34ffc9a039272a82636e215caa':
Allow Settings to set background data restrict on secondary users.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions