OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9046024
909ef30
)
Merge "Fix warning: macro redefined"
author
Yunlian Jiang
<yunlian@google.com>
Fri, 3 Feb 2017 02:46:15 +0000
(
02:46
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Feb 2017 02:46:15 +0000
(
02:46
+0000)
am:
909ef30a63
Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
Trivial merge