tree 39c94bf5dc59477a0239340423fd8f58fd7ea35a
parent e8d2cae4f0e7eeab8f16d36d2705345d62d1834d
parent 69093572ffdd845eaa9f58e8b8fdf40c559519db
author Logan Chien <loganchien@google.com> 1524789516 -0700
committer android-build-merger <android-build-merger@google.com> 1524789516 -0700

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

Change-Id: I79039dbb7e9d660193b54d16e5fce380140c75a1