diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 18:33:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 18:33:11 +0000 |
| commit | 4c40482c20dbdad854e78cf0486a875a7d57fcfb (patch) | |
| tree | 83c3c8e0d8ce17a6ee816a7efdb950e8ac55a072 /include/ScopedJavaUnicodeString.h | |
| parent | 72218eabeb40a042121b53218ebd20645102ea40 (diff) | |
| parent | a2bcec43c876f6a235e844bee2c99fb466dba4f7 (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 am: 73bae37d3c
am: a2bcec43c8
* commit 'a2bcec43c876f6a235e844bee2c99fb466dba4f7':
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