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:
8c49bbb
069915c
)
Merge "Fix errorprone build" am: 3abddeca75 -s ours
author
Colin Cross
<ccross@android.com>
Wed, 30 Aug 2017 00:46:45 +0000
(
00:46
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 Aug 2017 00:46:45 +0000
(
00:46
+0000)
am:
069915cd1c
-s ours
Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b
Trivial merge