tree 8bda2edc52dfbb3769a443a67c242240ed0111f5
parent 5d5cfe837ba8e986298078815dd30f397b7ce14f
parent 47983b8e604d421aefba80962dea816da5167cb0
author Neil Fuller <nfuller@google.com> 1401701542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401701542 +0000

am 47983b8e: Merge "Reset System properities between tests"

* commit '47983b8e604d421aefba80962dea816da5167cb0':
  Reset System properities between tests