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:
fafa73a
4f77ca1
)
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp...
author
Ajay Panicker
<apanicke@google.com>
Wed, 21 Sep 2016 00:12:20 +0000
(
00:12
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Sep 2016 00:12:20 +0000
(
00:12
+0000)
am:
4f77ca16e4
-s ours
Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8
Trivial merge