[automerger skipped] minadbd: More allowed properties.

Browse Source

am: 7a31ab675e -s ours
am skip reason: change_id Id4667fcaf0e908c391085b22e22c957acd01d9c4 with SHA1 3b9ef341be is in history

Change-Id: Ide33c9019fd42d5d44601f6517db945e8e1514ad

...

This commit is contained in:

Tao Bao

2019-06-11 12:03:13 -07:00

committed by android-build-merger

parent c6b382bd09 7a31ab675e

commit da1b196145

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available