tree 4f0e9eb6547b0b16b0272cab044766162bb6a812
parent d76a98d5f4997868da1832ed239f67c9ae150ace
parent 9e97dc7832949a67dbae4e28d2ea261accd571b4
author Mark Salyzyn <salyzyn@google.com> 1482434658 +0000
committer android-build-merger <android-build-merger@google.com> 1482434658 +0000

Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2eea4
am: 9e97dc7832

Change-Id: I414954c96ad8b803a0401d416887c9ce167db210