diff options
| author | Colin Cross <ccross@android.com> | 2018-11-06 18:42:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-06 18:42:03 +0000 |
| commit | a4680e1ebe242f0f46fe1233328c2d2ba03b6757 (patch) | |
| tree | 0d9f9e7e3b05bcde13ec9bcd0698644ebbf6dea7 /keystore/java/android/security/KeyStore.java | |
| parent | 3bedd0a674fc14dab3fc444619b5261a81ed97c7 (diff) | |
| parent | 054b0c0e06b1c7b51080dc6223535cf1f6af1f92 (diff) | |
Merge changes from topic "revert-protobuf3.5.2"
* changes:
Revert "Adapt to google::protobuf::uint64 type change"
Revert "Convert statsd_test and statsd_benchmark to proto lite"
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions