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:
a76da9e
3be893e
)
Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2
author
Jean-Michel Trivi
<jmtrivi@google.com>
Mon, 28 Aug 2017 16:47:44 +0000
(16:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 28 Aug 2017 16:47:44 +0000
(16:47 +0000)
am:
3be893e449
Change-Id: Ife6cd6b5772df03f0511c42b635984e840496626
Trivial merge