| commit | 7ccd3666d60c81390a49c03b12cc9d361d734484 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 28 11:03:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 28 11:03:46 2021 +0000 |
| tree | b513a1b19f622789606d971365aa0512478cd418 | |
| parent | 78f1a9bf513d27ef090fc524eeb880e9a3157846 [diff] | |
| parent | b370ca080aff7ef85d71ba63870ba72e3d3d9df5 [diff] |
Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313 Change-Id: I5de7e2c5ae0d8f17f991fd2967575dae1cbf8f39