tree 9c44ce5adb3850fb49fed4e21eddd7cbb97b7a85
parent f3fe5882294a8edade11e72e18e69f2e71189d4a
parent 665258fc505407c5273926cb9e3faab98da6034e
author Jiyong Park <jiyong@google.com> 1566294405 -0700
committer android-build-merger <android-build-merger@google.com> 1566294405 -0700

[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master
am: 665258fc50 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: I2b7a81f27987040d1cc292130a87f60ec2129ffc