diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 03:55:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 03:55:13 +0000 |
| commit | 73bae37d3c544304b440dce371ba5cc5759ab4c2 (patch) | |
| tree | 83c3c8e0d8ce17a6ee816a7efdb950e8ac55a072 /include/ScopedJavaUnicodeString.h | |
| parent | 75d2bbcc0d56e14a8bbb158a8319363138f26c99 (diff) | |
| parent | 020719a1d52ebfbc919d78a304d8a442e5135302 (diff) | |
Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev am: c87ce529ff -s ours am: e557db3a89 -s ours am: 15a3fb322b -s ours am: ba52c17473 -s ours
am: 020719a1d5
* commit '020719a1d52ebfbc919d78a304d8a442e5135302':
DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions