aeb41ec103
Merge commit 'b2061a30da29ee531c16862a5be3566e3b860839' into gingerbread-plus-aosp * commit 'b2061a30da29ee531c16862a5be3566e3b860839': resolv: make internal symbols static/hidden