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 | 94d34781c286282a82509806018edb954c74a746 (patch) | |
| tree | 839b87e7c369e76f1a8e54c3bad073e0da98cc0a /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 7df9c2046691cf46d62b169fc02b8a18150882f4 (diff) | |
| parent | 36e576419389f3ac100b0bc65660021a5e19d754 (diff) | |
Merge changes from topic "recognition_service-mnc-dev" into nyc-mr2-dev
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527 am: 122f5e51bf
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
[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