tree a432419de988f889b1b14182a3c32031e02ffa17
parent 95b87907178ab9288128d88a13de2b135274eb70
parent b1e3bb2798bb6002b186081d9b0234bdfa432a14
author Colin Cross <ccross@android.com> 1372203035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372203035 -0700

am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master

* commit 'b1e3bb2798bb6002b186081d9b0234bdfa432a14':
  init: move initial property area allocation into bionic
  property_service: make /dev/__properties__ readable