From: Nick Kralevich <nnk@google.com>
Date: Sat, 26 Jan 2013 01:11:51 +0000 (-0800)
Subject: am 2ebcd19c: am 27818d2a: am b871e5d6: Merge "system_properties: do more checking... 
X-Git-Tag: android-x86-4.4-r1~391
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85e76a36525a8b01d0fd904a2b84f98ad4a60558;p=android-x86%2Fbionic.git

am 2ebcd19c: am 27818d2a: am b871e5d6: Merge "system_properties: do more checking of file"

# Via Android Git Automerger (2) and others
* commit '2ebcd19cbc42c5edce189df630a48feb9ffec16d':
  system_properties: do more checking of file
---

85e76a36525a8b01d0fd904a2b84f98ad4a60558