Commit 6c309320 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Avoid trademarks." 

am: a7008916

Change-Id: I3e247f9f978b6e2b26e5219e9a315444f9cdb8c5
parents c6bfb6b9 a7008916
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment