OSDN Git Service

(root) / android-x86 / hardware-ril.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4564b1a 1d31c54)
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)
* commit '1d31c54fb254ec94e9f33e9517d69340ffda564d':
  Prepare to remove ril from global include paths


Trivial merge
hardware/ril
About OSDN
Find Software
Develop Software
Help