tree cf76b9177af36d6fc321518628da18870572f9ae
parent be9a663caf071e131636320ee4b1f39fa5a60c94
parent 2bbb3d4c3702169ef5747a58bb86d767fd9201e0
author Jiyong Park <jiyong@google.com> 1566297959 -0700
committer android-build-merger <android-build-merger@google.com> 1566297959 -0700

[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: 2bbb3d4c37 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 1cc9566ee2 is in history

Change-Id: I48ce4e1ce6b8dc1a19b63f78b47aefa50e7a2952