tree 942b6d83823646ad06a29f87083cd02d64708373
parent dc9f31be04e81fb411b38cba165bfffdda2ced4b
parent 0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522
author Dan Willemsen <dwillemsen@google.com> 1491324173 +0000
committer android-build-merger <android-build-merger@google.com> 1491324173 +0000

Merge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59 am: 2ef2ec65b1
am: 0ed5b5f1d5

Change-Id: I0af09f20deffd554cef1948c7bf83e2c10d21f01