tree 39c94bf5dc59477a0239340423fd8f58fd7ea35a
parent 1df84d1eb0db623e0de639eac6dd41de48a100bd
parent 2e9d6011fe4f4d2e8c065210d0118e7b9d9f305c
author Logan Chien <loganchien@google.com> 1524789146 -0700
committer android-build-merger <android-build-merger@google.com> 1524789146 -0700

Merge "Deprecate <cutils/log.h> and <utils/Log.h>"
am: 2e9d6011fe

Change-Id: Icbbf031b9fd97021de5d49cda60b80443442f3a8