diff options
| author | Eugene Susla <eugenesusla@google.com> | 2018-03-09 18:42:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-09 18:42:08 +0000 |
| commit | 338cb38cad5a1737dff1f57e13c5dbd156b882b3 (patch) | |
| tree | 55eb9d1c3aa9c0618b214e9b402a7e6020a06299 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 28c7060b11917b79780413c804e3e922d0792231 (diff) | |
| parent | cf92266ad9094aaaad484ca1739bab3e54bb71d0 (diff) | |
Merge changes from topic "recognition_service-mnc-dev" into nyc-dev
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions