tree 0da994f835d116e8243525f6d1531127c24c19b7
parent ddbb728eff4f4eedad596b132ccb7c227006976d
parent 2ebcd19cbc42c5edce189df630a48feb9ffec16d
author Nick Kralevich <nnk@google.com> 1359162711 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359162711 -0800

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