OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e5c6f7
bfab966
)
Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am:...
author
Colin Cross
<ccross@android.com>
Thu, 31 Aug 2017 22:43:03 +0000
(22:43 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 31 Aug 2017 22:43:03 +0000
(22:43 +0000)
am:
bfab966085
-s ours
Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549
Trivial merge