Move annotation library to the standard directory.
Additionally:
- Reformat code that was making Checkstyle unhappy
- Delete AndroidManifest.xml as thats not a thing that is used.
Test: ./gradlew assembleDebug
Change-Id: I0ac209c35c55641c444d3060cc3fb4bdfa493e68
diff --git a/settings.gradle b/settings.gradle
index 41c6beb..7ef3fcb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -39,7 +39,7 @@
includeProject(":activity:activity-ktx", "activity/activity-ktx")
includeProject(":activity:integration-tests:testapp", "activity/integration-tests/testapp")
includeProject(":ads-identifier", "ads/ads-identifier")
-includeProject(":annotation", "annotations")
+includeProject(":annotation:annotation", "annotation/annotation")
includeProject(":annotation:annotation-sampled", "annotation/annotation-sampled")
includeProject(":annotation:annotation-experimental", "annotation/annotation-experimental")
includeProject(":annotation:annotation-experimental-lint", "annotation/annotation-experimental-lint")
