tree d94df98133c6ec34d34f2e0b16d6b7dbf505692a
parent 2f8626c3f7ea2616e072a44d2608adb44ce575a3
parent 6c37304201b1605baea54a3462979f3693241aed
author Tao Bao <tbao@google.com> 1559701829 -0700
committer android-build-merger <android-build-merger@google.com> 1559701829 -0700

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

Change-Id: I8295063fd81b0cdc7625410c1482c9bab538ebbc