tree fe3054b8464e37333955e3620d73764c41d5afc6
parent af4d1dda03f50bfce2ec03f8e5a6a6c1dad12ab6
parent 1ef7f92871e30301d9b74e4c79203f730a86c1be
author Tao Bao <tbao@google.com> 1559696005 -0700
committer android-build-merger <android-build-merger@google.com> 1559696005 -0700

Merge "minadbd: More allowed properties."
am: 1ef7f92871

Change-Id: I2e663ae4d334f40bf688b70630ad823c1eb92444