tree 42ac3a124b48a9f1459540e7d0173b32c27b9a27
parent c6b382bd09a1a4caa591f0309a42afd1b0598981
parent 7a31ab675e30de858c690dcff8f1daf447358dae
author Tao Bao <tbao@google.com> 1560279793 -0700
committer android-build-merger <android-build-merger@google.com> 1560279793 -0700

[automerger skipped] minadbd: More allowed properties.
am: 7a31ab675e -s ours
am skip reason: change_id Id4667fcaf0e908c391085b22e22c957acd01d9c4 with SHA1 3b9ef341be is in history

Change-Id: Ide33c9019fd42d5d44601f6517db945e8e1514ad