diff options
| author | Xin Li <delphij@google.com> | 2020-09-11 02:02:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:02:55 +0000 |
| commit | 8189e71d2cdccbbfd2088130d616b7e968a6b923 (patch) | |
| tree | 9a7ce8e1e7c99579ddcc47f54329575df66e1932 | |
| parent | 2a1b067d515ac4cc80ec126e269d66a07a8abc0d (diff) | |
| parent | 3739a9643aac645a1f29e95c84a2bf529595e805 (diff) | |
| download | protobuf-8189e71d2cdccbbfd2088130d616b7e968a6b923.tar.gz | |
[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s ours am: 3739a9643a -s ours
am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385
Change-Id: Ie3726462402a1bd180bfc2b98c0fc46ae219f47a
0 files changed, 0 insertions, 0 deletions