diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 03:53:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 03:53:17 +0000 |
| commit | 020719a1d52ebfbc919d78a304d8a442e5135302 (patch) | |
| tree | 31da0dd751b8a53939dddf72cb2bcade237ea10d /include/ScopedJavaUnicodeString.h | |
| parent | 3f9db209e5139484619ed4fe65dfec8c5f6e5a54 (diff) | |
| parent | ba52c17473b2717b2a85a76448f63b3762574776 (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
* commit 'ba52c17473b2717b2a85a76448f63b3762574776':
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