tree f87809cdbf548152fe2259a4604ea21a0ae18906
parent 01d885e0951f281b79910e04e2dda8362924c4b0
parent 6ee34f02862db7aa912209b9af58e288402887fb
author Tom Cherry <tomcherry@google.com> 1490812734 +0000
committer android-build-merger <android-build-merger@google.com> 1490812734 +0000

Merge "init: replace property_get with its android::base equivalent" am: 7bcce1e3c0
am: 6ee34f0286

Change-Id: Ibca5d90522ec47397f030501782c125002a27f3b