diff options
| author | Christopher Tate <ctate@google.com> | 2016-04-20 21:48:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 21:48:43 +0000 |
| commit | b965ced011bdd7a3ec5450f93d1c58b889514f11 (patch) | |
| tree | dba8d74c5df6d02bf63eec7ec8f48aeca0579f61 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 2dbac6cee58c343682ebf6590ae170c2acd067e4 (diff) | |
| parent | 343600c3ecff31826e50d40821927e446adb9b0a (diff) | |
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7
am: 343600c
* commit '343600c3ecff31826e50d40821927e446adb9b0a':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions