| commit | bf277f37fa9b6b101172ce20f46dda5eaa02a1e1 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Tue Mar 14 14:40:45 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 14 14:40:45 2023 +0000 |
| tree | 93f9be16edfc681d3a38f6ab69488a1a256b7136 | |
| parent | 8309e41946d6d86db397104d0a2bd19bb29b8974 [diff] | |
| parent | 893b7c23e72084319611494e11f93fbf2d0d8243 [diff] |
Merge changes Iec35c735,Ic3238144 * changes: Allow CPP<->legacy and NDK<->legacy to coexist in the same module Declare `ConversionResult` in `android` namespace