OSDN Git Service

resolve merge conflicts of 0af9505 to nyc-dev-plus-aosp
authorGlenn Kasten <gkasten@google.com>
Thu, 31 Mar 2016 16:34:10 +0000 (09:34 -0700)
committerGlenn Kasten <gkasten@google.com>
Thu, 31 Mar 2016 16:36:28 +0000 (09:36 -0700)
commitf0bcb9e6f2b18eeebe8ceea49b0d7d0418b0cbbe
treeb2311ca6955d946b6f12a086cac34a9066718120
parent4d0d993974e9645860bca3955dfcf7d83d639925
parent0af9505160976a84e8b5df92cd3026dd1b08ccf0
resolve merge conflicts of 0af9505 to nyc-dev-plus-aosp

Change-Id: I5701acd035d1918808f6d4a76c033d48d3bffabb
audio_utils/Android.mk
brillo/audio/audioservice/Android.mk