Merge "123223339: Include type annotations in annotation merger" am: 1ff8c824 am: 466e139c
am: 08e93815 Change-Id: Id80c861be25a2b275280ed5e77c0fd7b6bb27e62
Showing
- src/main/java/com/android/tools/metalava/AnnotationsMerger.kt 62 additions, 19 deletions...main/java/com/android/tools/metalava/AnnotationsMerger.kt
- src/main/java/com/android/tools/metalava/model/psi/PsiTypeItem.kt 1 addition, 1 deletion.../java/com/android/tools/metalava/model/psi/PsiTypeItem.kt
- src/test/java/com/android/tools/metalava/AnnotationsMergerTest.kt 62 additions, 15 deletions.../java/com/android/tools/metalava/AnnotationsMergerTest.kt
- src/test/java/com/android/tools/metalava/DriverTest.kt 4 additions, 0 deletionssrc/test/java/com/android/tools/metalava/DriverTest.kt
Loading
Please register or sign in to comment