[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master am: 665258fc50 -s ours am: 625e0eef9f -s ours
am:d2f7175e54-s ours am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1f20f181c53is in history Change-Id: I49ef932b690ce067d7097e67909376504b8365e9
This commit is contained in: