tree 79a3d6c2ede46f3592e9d4817aec5378b8291292
parent 9a26425282156d29f6c34838bf13769e00d11703
parent c20120f218f9387f3730967ff788631c2651122d
author Jiyong Park <jiyong@google.com> 1566321630 -0700
committer android-build-merger <android-build-merger@google.com> 1566321630 -0700

[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 SHA1 0c6dc7b709 is in history

Change-Id: I37fe5b9c1ad9790373b664a31cd1cba66f92aae5