tree f27c292d6584c4d5f2e486a40e91c8c8539bfb33
parent d503cc21ec663b39e8d84feb373d3a287bb02d63
parent df5d4482074fc68a25a6a33992f3fc5164c2d3ec
author Elliott Hughes <enh@google.com> 1429929999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429929999 +0000

am df5d4482: Merge "Clean up property service initialization."

* commit 'df5d4482074fc68a25a6a33992f3fc5164c2d3ec':
  Clean up property service initialization.