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:
af97c88
cb970f4
)
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a...
author
Ajay Panicker
<apanicke@google.com>
Wed, 21 Sep 2016 00:10:52 +0000
(
00:10
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Sep 2016 00:10:52 +0000
(
00:10
+0000)
am:
cb970f408e
-s ours
Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8
Trivial merge