tree 7a922a82acc8bad61354ed53665a6b9e573fd930
parent 860448ffec5dc25b16c5039f1a24699ae1e52490
parent da1b19614530c40704149f76976113277493e0e0
author Tao Bao <tbao@google.com> 1560280094 -0700
committer android-build-merger <android-build-merger@google.com> 1560280094 -0700

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

Change-Id: I368ff9c2d3da5e0b4d24de42c9f48969a1dce015