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:
6760a7c
c6e0e75
)
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp am: a553354e84
author
Tamas Berghammer
<tberghammer@google.com>
Wed, 18 Jan 2017 22:38:58 +0000
(22:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 18 Jan 2017 22:38:58 +0000
(22:38 +0000)
am:
c6e0e75534
-s ours
Change-Id: Iac5d3bde4481bc509ab21fe0979be0f1f2064110
Trivial merge