OSDN Git Service

Merge "Revert "audiohal: Get rid of multiple inheritance in IDevice implementation...
authorMikhail Naganov <mnaganov@google.com>
Wed, 3 May 2017 19:20:48 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 19:20:48 +0000 (19:20 +0000)
commit11397b8339306f5f8429739f5f5b05c59840becb
tree41ce2dd81460dffbf6ba7bfc72a17a92e815494a
parentbdfc7dd70d7aa707e44643056fde2d5bc84e465e
parent62ce08c3a276529ae37f5dead1f81321d85f3b38
Merge "Revert "audiohal: Get rid of multiple inheritance in IDevice implementation"" into oc-dev am: ed84acb9ff
am: 62ce08c3a2

Change-Id: I101943359421f8a4652fba2c53a45517f34ab23c