| commit | 766c2b1365dca2544dbb9aaeaaee2579925de0ec | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 28 13:00:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 28 13:00:22 2021 +0000 |
| tree | 359a3b043b3d9e59b71bd79451e3eea2af9808fb | |
| parent | dbb84b63fc5ea75887ad388521a72baf8f31bef9 [diff] | |
| parent | 0ac02ae06e9b34bb86a22043970ccb76059150fe [diff] |
Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a am: 7ccd3666d6 am: 0d084d8990 am: 0ac02ae06e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313 Change-Id: If90096b541453e70453069cb2596422001dacef0