OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7df9c20
36e5764
)
Merge changes from topic "recognition_service-mnc-dev" into nyc-mr2-dev
author
Eugene Susla
<eugenesusla@google.com>
Fri, 9 Mar 2018 18:42:08 +0000
(18:42 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 9 Mar 2018 18:42:08 +0000
(18:42 +0000)
* 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
Trivial merge