diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-04-20 22:26:36 +0900 |
|---|---|---|
| committer | Hugo Benichi <hugobenichi@google.com> | 2017-04-20 22:26:50 +0900 |
| commit | 3ff96e5dd806f6ce608248f5698fbebdcec4f58c (patch) | |
| tree | 074b9c46eff90014c22584ed110d92c1631b8b11 /rs/java/android/renderscript/ScriptIntrinsic.java | |
| parent | 06c68a68ef568e2fc4d1f38969ff8a72ec232d4b (diff) | |
| parent | 7bbd03be361f406a0c600b44e7b442e166090b50 (diff) | |
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
Conflits were:
- static import section of ConnectivityService
- code deleted in commit a0385686769c077a163768f1eb3f8df10e30ccd9
Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsic.java')
0 files changed, 0 insertions, 0 deletions