[automerger skipped] Merge "Fix KNOWN_CODENAMES javadoc to mention that all codenames are there." am: 8f721b9229 am: 79f8886cb4 -s ours am: 22caf0e687 -s ours am: aa32b3c5d4 -s ours am: f837c60ae4 -s ours
am skip reason: Merged-In I93cade7cb11e34557445b74d1e1841508061d616 with SHA-1 82d33f26f9 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072000
Change-Id: I902bd720cf255d67c196a0b0682b3932b483b535
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: