OSDN Git Service

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)
commita64203d6085c6a28ccf8d936495f935aced70c61
tree4de15530943fe237833df783329902ba1e656892
parentecfc6b408bddbc8c3d6137d13258f99c26fc391c
parenta5d8c3718d23cbe316cb10106bce95c44bb57489
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
am: a5d8c3718d

Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35