From: Holly Jiuyu Sun <jiuyu@google.com>
Date: Thu, 14 Dec 2017 22:37:58 +0000 (+0000)
Subject: Merge "Confirmation code second try."
X-Git-Tag: android-x86-9.0-r1~288^2~9^2~2^2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cdc3c3ec77;p=android-x86%2Fframeworks-base.git

Merge "Confirmation code second try."
am: df0f5e9791

Change-Id: I426c5fcb2610cd1740fb9d6cd0a98a7bacfcb58a
---

cdc3c3ec77da3c05a5358ef736d55cbc8e1aa5b0