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:
153f5a7
8df8455
)
Merge "Audio assets: add NFC sounds" am: 5cb7cd68a0
author
Jean-Michel Trivi
<jmtrivi@google.com>
Thu, 12 Jul 2018 22:59:41 +0000
(15:59 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 Jul 2018 22:59:41 +0000
(15:59 -0700)
am:
8df8455384
Change-Id: I11d6eba4ca5e888e71e91fdef2d7dd8383391ec8
Trivial merge