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)
commit5af7309214263ba3f67e5e22a489c57647d7d57e
tree9a9834920296bb4abe5784c3dc50ea3c6f42d02a
parent5fe9d20ae77bef2d703d05b0ba3d99545fc4cc8a
parentbbe900ad120cb1869d57841d5ad8c160b1d146e9
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23 am: 6f84b4a716
am: bbe900ad12

Change-Id: I4ee9513b768984ab477c3585bd5e78032208c092