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:
407d494
6041de0
)
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt...
author
David Brazdil
<dbrazdil@google.com>
Thu, 24 May 2018 19:06:00 +0000
(12:06 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 24 May 2018 19:06:00 +0000
(12:06 -0700)
am:
6041de0722
-s ours
Change-Id: I1fe6b92ca9db6ea66427760fb529b39aaf30b304
Trivial merge