Commit 15a3fb32 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
am: e557db3a  -s ours

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