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:
da12b4b
e60aa74
)
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp...
author
Ajay Panicker
<apanicke@google.com>
Wed, 21 Sep 2016 04:13:46 +0000
(
04:13
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Sep 2016 04:13:46 +0000
(
04:13
+0000)
am:
e60aa74d44
-s ours
Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf
Trivial merge