tree d94df98133c6ec34d34f2e0b16d6b7dbf505692a
parent 8b733c3e84ed4865669bd321dc921f86e47a80a7
parent 9b2cfec8dda319038e2f3803052e84aed96395a4
author Tao Bao <tbao@google.com> 1559703360 -0700
committer android-build-merger <android-build-merger@google.com> 1559703360 -0700

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

Change-Id: I9f8a5adacd97e02a893924b8d450ac994df37015