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