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:
76a14c4
4e15886
)
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev am: 2ce80c83...
author
Etan Cohen
<etancohen@google.com>
Wed, 29 Mar 2017 20:31:37 +0000
(20:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 29 Mar 2017 20:31:37 +0000
(20:31 +0000)
am:
4e158866f8
-s ours
Change-Id: I4e056cfa17e44bcbbcc017208588effa398fa36f
Trivial merge