[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" am: bd8e232e20 -s ours am: 439de8d1ee -s ours
am:c20120f218-s ours am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA10c6dc7b709is in history Change-Id: I37fe5b9c1ad9790373b664a31cd1cba66f92aae5
This commit is contained in: