diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-27 21:03:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 21:03:17 +0000 |
| commit | 4cfa238971fe97b0e5e3bbe5d456de93c6d31788 (patch) | |
| tree | abd55471575660e0dc95a1f49f9bdb9af8bd643d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5e59f002a840fdaffd5559321b90875cac3938b3 (diff) | |
| parent | 98cbe497f58aaf8ab8bc106d79a3aed567d9b58b (diff) | |
am 98cbe497: am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '98cbe497f58aaf8ab8bc106d79a3aed567d9b58b':
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