tree 765c153714b2ae39ef20f8ed8a8111f7a936572a
parent 347a99fe02580bda0dc33f0817e0e28a4089118d
parent 2ef2ec65b1323129f8b3a0f6090e85843966dffd
author Dan Willemsen <dwillemsen@google.com> 1491323899 +0000
committer android-build-merger <android-build-merger@google.com> 1491323899 +0000

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

Change-Id: Ic95e1868489b0564d994d2f927eb017cf288a6a2