From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 28 Sep 2015 21:58:30 +0000 (+0000)
Subject: am 1d31c54f: am 3cf0775d: resolved conflicts for ba95966e to stage-aosp-master
X-Git-Tag: android-x86-7.1-r1~64
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c781aec167859f5a9e7b67e6ff25d6c04f8c5f3;p=android-x86%2Fhardware-ril.git

am 1d31c54f: am 3cf0775d: resolved conflicts for ba95966e to stage-aosp-master

* commit '1d31c54fb254ec94e9f33e9517d69340ffda564d':
  Prepare to remove ril from global include paths
---

5c781aec167859f5a9e7b67e6ff25d6c04f8c5f3