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