diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 03:47:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 03:47:50 +0000 |
| commit | ba52c17473b2717b2a85a76448f63b3762574776 (patch) | |
| tree | 31da0dd751b8a53939dddf72cb2bcade237ea10d /include/ScopedJavaUnicodeString.h | |
| parent | 83c293c477edc7fd12bed1e70eb4065bbaabb950 (diff) | |
| parent | 15a3fb322b7f80c6c59a0692ae3cd675402438ab (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
* commit '15a3fb322b7f80c6c59a0692ae3cd675402438ab':
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