tree e5655c2dfc2ef5ee3b68997116d7c5978708275d
parent 56935417ceac36ea411b1489e08fec64d188bd79
parent ed02fbf05c21442f40407bfaefcca35b985ad66a
author Elliott Hughes <enh@google.com> 1400112113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400112113 +0000

am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit 'ed02fbf05c21442f40407bfaefcca35b985ad66a':
  Clean up some unnecessary system_properties cruft.