OSDN Git Service

am 1d31c54f: am 3cf0775d: resolved conflicts for ba95966e to stage-aosp-master
authorDan Willemsen <dwillemsen@google.com>
Mon, 28 Sep 2015 21:58:30 +0000 (21:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Sep 2015 21:58:30 +0000 (21:58 +0000)
commit5c781aec167859f5a9e7b67e6ff25d6c04f8c5f3
treef1b122899579daaa8f872fb481dd877db6d15f1e
parent4564b1a85c800195a94fba78891c2553cf6d3b30
parent1d31c54fb254ec94e9f33e9517d69340ffda564d
am 1d31c54f: am 3cf0775d: resolved conflicts for ba95966e to stage-aosp-master

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