commit | 6293480feaeb310b7cd94205d1c51de29c650201 | [log] [tgz] |
---|---|---|
author | Jiyong Park <jiyong@google.com> | Tue Aug 20 10:51:14 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 20 10:51:14 2019 -0700 |
tree | 50777a5c5ba077a302cfd1847f72811d8157af1a | |
parent | 77ac387996305656e708128e1655ffb8a10ea5d7 [diff] | |
parent | 01ad7bdee88a8789f085a3334004d814e1f33858 [diff] |
[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: d5d60f891b -s ours am: 01ad7bdee8 -s ours am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history Change-Id: I4c9dcca3e5c53dbd763dad59b6f5e4c2f4b71fb6