| commit | 1d31c54fb254ec94e9f33e9517d69340ffda564d | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Mon Sep 28 21:51:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 28 21:51:02 2015 +0000 |
| tree | f1b122899579daaa8f872fb481dd877db6d15f1e | |
| parent | e75f0d55fb5ef52ef1bcfbada934a61534572c60 [diff] | |
| parent | 3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66 [diff] |
am 3cf0775d: resolved conflicts for ba95966e to stage-aosp-master * commit '3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66': Prepare to remove ril from global include paths