From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 13 Aug 2015 01:02:21 +0000 (+0000)
Subject: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level... 
X-Git-Tag: android-x86-7.1-r1~382^2~9^2~61
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ff3e53faaab66975674e16a1822d926c529bc5d;p=android-x86%2Fbuild.git

am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev

* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
  Fix issie #23116383: Include security patch level in Settings
---

6ff3e53faaab66975674e16a1822d926c529bc5d