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:
c8e1963
71ef453
)
[automerger skipped] Replace ALL_LISTS policy with JUST_WARN. am: a4ba0e442a
author
Mathew Inwood
<mathewi@google.com>
Wed, 9 May 2018 10:51:37 +0000
(
03:51
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 9 May 2018 10:51:37 +0000
(
03:51
-0700)
am:
71ef453a6c
-s ours
Change-Id: I38ccacc9a7e63e38aa26dd7ba4c705d89ffc2c50
Trivial merge