tree 034b34abded47d933f5e4f84b8f92936fb74bd47
parent 40bae5e1c63a7fe7cd3b64b1d13c1bbb6f18b84a
parent cc02f9652f7994c835c7073d13b30f60ff1134af
author Elliott Hughes <enh@google.com> 1474918828 +0000
committer android-build-merger <android-build-merger@google.com> 1474918828 +0000

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

Change-Id: I5f0d55f980055cee3c7ae477d1bdbd1d05b97dc1