Commit e557db3a authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision... 

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev
am: c87ce529  -s ours

* commit 'c87ce529':
  DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
parents a289f967 c87ce529
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