diff options
| author | Rubin Xu <rubinxu@google.com> | 2014-11-19 00:09:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:09:38 +0000 |
| commit | 0122db0a6397f5bd08042e1a5919114e3cccb9f4 (patch) | |
| tree | 2f9e81a8c58ec11bd1668f6e0645c865ecfc461b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df57b22bc679664138079a4f15966b19f63f0aea (diff) | |
| parent | 3a7d3fc60e1347ff9bdddb8040237e2818d67a0e (diff) | |
am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
Fix equality test in getProfileOwnerAdmin()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions