OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecfc6b4 a5d8c37)
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
authorGlenn Kasten <gkasten@google.com>
Tue, 29 May 2018 19:21:18 +0000 (12:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 May 2018 19:21:18 +0000 (12:21 -0700)
am: a5d8c3718d

Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help