diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-23 00:20:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-23 00:20:56 +0000 |
| commit | e0f570cd22f949fc93108a8873eba438a0b514ac (patch) | |
| tree | 500c64254f788837b173c1a03b10c7796b4de3b4 | |
| parent | 02d5b59eee9cbc060a612070be66e6f93914b907 (diff) | |
| parent | 200f125b9f99ef5bdff03d9a8e2f762640bd14e5 (diff) | |
| download | libcore-e0f570cd22f949fc93108a8873eba438a0b514ac.zip libcore-e0f570cd22f949fc93108a8873eba438a0b514ac.tar.gz libcore-e0f570cd22f949fc93108a8873eba438a0b514ac.tar.bz2 | |
am 200f125b: Merge "Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"."
* commit '200f125b9f99ef5bdff03d9a8e2f762640bd14e5':
Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
0 files changed, 0 insertions, 0 deletions