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:
f83ced7
0a1a0e6
)
DO NOT MERGE: Revert "Fix build" am: a0a908f5d6
author
Tamas Berghammer
<tberghammer@google.com>
Wed, 18 Jan 2017 22:13:02 +0000
(22:13 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 18 Jan 2017 22:13:02 +0000
(22:13 +0000)
am:
0a1a0e6e61
-s ours
Change-Id: I9d4ecca39800413fa9eb483715bf810028d61334
Trivial merge