Skip to content
Commit 02cbe8f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id93bcaea,Ia8f9f910 

* changes:
  Pass --remove-tools-declarations to manifest merger
  Don't use merged manifest for android_library modules
parents 18805e48 aa1c6f1f
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