tree 7299293ed57e073110cee702ada8c4ac9cf3dacb
parent 508a1a4df72c8c7dac7fd967edac38aa1f84194f
parent ec556521e23f66ea52e41a7d9540b2dec31766c5
author Elliott Hughes <enh@google.com> 1421101691 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421101691 +0000

am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."

* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.