From: Xin Li <delphij@google.com>
Date: Mon, 25 Feb 2019 15:25:05 +0000 (-0800)
Subject: [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=987971bf3adfc647461f0c5920ca49090d7054ee;p=android-x86%2Fsystem-extras.git

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 97b9015991 -s ours
am skip reason: subject contains skip directive

Change-Id: Icef4a9d79b578d4f0fe55715b16190b4f60c6a7e
---

987971bf3adfc647461f0c5920ca49090d7054ee