Skip to content
Commit f750ad0a authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

[automerger skipped]Allow proto properties in cc/java_defaults am: b785b616 -s ours 

am: 22d5f40e  -s ours

Change-Id: I60cdf7f3735ab4c495a8ebd6c958e1c67e8ab3c6
parents 92ccab2d 22d5f40e
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