tree 9045db4e38363366de43f77a68c475de85acd9d7
parent 2b9beaf4b9ead5cbbbf9d7c3af768aa3cc21f5c6
parent 2bd99b3050fc4657be64d68d86f73dd5aeca2109
author Xin Li <delphij@google.com> 1602223582 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602223582 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 0a1ec3a4d5 -s ours am: a421c0c490 -s ours am: 2bd99b3050 -s ours

am skip reason: Change-Id I257e0d33c531da42ea62212144e0d23e9dc9d137 with SHA-1 d802c3b7b4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/sysprop/+/12797506

Change-Id: I524fb19fea7e281bc8d6cd489ed8bb5786c702d1