From: Zach Jang <zachjang@google.com>
Date: Mon, 21 Sep 2015 21:06:10 +0000 (+0000)
Subject: am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f... 
X-Git-Tag: android-x86-6.0-r1~68^2^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef024064;p=android-x86%2Fbuild.git

am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '0961150929c775a439f31b8c4fb35ba6a03c6f08':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
---

ef02406452c41f90955460179c1f1d900bcedba9