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 | 714fb7ae841eed96c76cc62b5b977fc7928b85d4 (patch) | |
| tree | 6aec8967cc768db2b9004c0d5e772b6fcdba5e56 /rs/java/android/renderscript/ScriptIntrinsicHistogram.java | |
| parent | 6e30a00c9694cdc4f1d7016473b0752598235561 (diff) | |
| parent | 24fc6f78957439e3acd1482300cde0c8663fd5cd (diff) | |
Merge changes from topic "recognition_service-mnc-dev" into oc-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 skipped: 36e5764193
[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/ScriptIntrinsicHistogram.java')
0 files changed, 0 insertions, 0 deletions