tree ed560d74e56c714ff50a858cd077d351bfeb1bfc
parent b7b91d68377b2d1790f8551f585fa637d84258ab
parent 9de27539e79aa41b54f9aba16877928f6089ee87
author Android Build Merger (Role) <android-build-merger@google.com> 1466724545 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466724545 +0000

Merge "Move the hacked-up glob.h off bionic internals. am: 20e0898b96 am: 43ad9fcb9b" into nyc-mr1-dev-plus-aosp