Skip to content
Commit 5af5f7a8 authored by Alexander Smundak's avatar Alexander Smundak Committed by android-build-merger
Browse files

[automerger skipped] Merge "Provide java_defaults as a counterpart to the... 

[automerger skipped] Merge "Provide java_defaults as a counterpart to the settings.mk file" am: ad8b5c99 am: 9870b565
am: 9624d834 -s ours
am skip reason: change_id I9e57744737430ff7e1ab57891dc81d1dd3bbcb83 with SHA1 0f019d08 is in history

Change-Id: Ibedddae9ccee535136acc493b64f8412388b239b
parents dd4895f5 9624d834
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