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 21:52:55 +0000 (21:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Dec 2016 21:52:55 +0000 (21:52 +0000)
am: 6f84b4a716

Change-Id: I3b93f676e39094a3ca5e2161e968185662f6dcf2


Trivial merge