Skip to content
Commit c8437b6c authored by Jelle Fresen's avatar Jelle Fresen Committed by android-build-merger
Browse files

[automerger skipped] Merge "Ignore /.idea and *.iml files" am: 1f1f263a 

am: 3fce78c5 -s ours
am skip reason: change_id I9b8142768173f3db153fda494f0c49697b703a38 with SHA1 c7e56494 is in history

Change-Id: I989abb63a2516bd243f055a698b74a6a1c00aac5
parents df396d12 3fce78c5
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