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 | a3644de7872f0b6c56e11ffde366ad5af0b7a496 (patch) | |
| tree | 742e3777c26e845c39b99f48e18a5f78b62f50db /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 377fd4ea35bf6e57f97aa637be0abe376533174a (diff) | |
| parent | bca318e527f597b480071acfc404c71c193ebfa9 (diff) | |
Merge changes from topic "recognition_service-mnc-dev" into nyc-mr1-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
[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/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions