Skip to content
Commit c20120f2 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

[automerger skipped] Merge "glob pattern is used for AIDL files under... 

[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" am: bd8e232e -s ours
am: 439de8d1 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b7 is in history

Change-Id: I3e58d5b3d1e812ab40713cdff54c84a8742a77d2
parents 6a67897e 439de8d1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment