tree d6acd25924c664a78566d3fe889e77107dfbeb95
parent 84ef8e1d31c8f1d8b8203094772f95fe755946bb
parent f02d014ab2b4e55d5686ef67adff25f5eb8ebcd4
author Jiyong Park <jiyong@google.com> 1573711893 -0800
committer android-build-merger <android-build-merger@google.com> 1573711893 -0800

[automerger skipped] Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" am: 546f68a66f am: 06fa6a7e21
am: f02d014ab2 -s ours
am skip reason: change_id Ic6997f7b83318fa5d0c819c197cb5965adc31347 with SHA1 9718349faa is in history

Change-Id: I0bd87eeee302bb867310852c5b0a72c0962fab13