tree 5bf29c411dd3d024c28a3cbb3835a7d29f380c55
parent 334fd5f2b173e1b893415d96d2fa4212c6bbfaaa
parent 5726cbc18420c3b2722a68ebc10acb5c39d2052f
author Tao Bao <tbao@google.com> 1559707144 -0700
committer android-build-merger <android-build-merger@google.com> 1559707144 -0700

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

Change-Id: I3b0a12a7d7eb19112a8049dadc2c3d563feddbaf