tree 4f7aa2ba4ccf0fc29fb709346392e0b9aa33442d
parent 1d55666106f80ae0824ac284f82d90899575358c
parent be9a94fd17b5303d4ad5553216f47eb87047f8e3
author Elliott Hughes <enh@google.com> 1474918936 +0000
committer android-build-merger <android-build-merger@google.com> 1474918936 +0000

Merge "Switch to <android-base/properties.h>." am: cc02f9652f
am: be9a94fd17

Change-Id: Ib5e4fb8d20e04df7b592af96d898afbbc6846620