OSDN Git Service

Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23...
authorMark Salyzyn <salyzyn@google.com>
Tue, 27 Dec 2016 22:00:26 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Dec 2016 22:00:26 +0000 (22:00 +0000)
am: bbe900ad12

Change-Id: I4ee9513b768984ab477c3585bd5e78032208c092


Trivial merge