Skip to content
Commit b6165c58 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add build rule to merge annotation zips"" into... 

Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 47456591 am: 59e08f24 am: 385b55ed am: 866b068b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I432f3c8d646f04d33614a66183eadf07aba99639
parents ea1857ae 866b068b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment