tree 7e41f0f62967fb097c303b8fbf8ca97619c96bd4
parent 58745b4dccb74b9987949667466b9b8468a639cb
parent 94131bee05ae9909223fe785d7cc424dc9a5acdc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576176377 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576176377 +0000

Merge "Remove some duplication of validation logic" am: d8aa23e1ca am: 94131bee05

Change-Id: I08912f25f9b51838a92322dba55bf1934d6302c4