diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-09-09 23:50:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 23:50:04 +0000 |
| commit | 732edf098fe9728238bf3b69a3b3cfcb221edf35 (patch) | |
| tree | db8240cb51045529de5734745a1661ef21a33ae6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 98ff7bce66f03da14e39fa7e532a7202bde7dce6 (diff) | |
| parent | 6590d7c75c1d706f70ebf6a5594d6a7601c080df (diff) | |
Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* changes:
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions