tree 3adec75bf9a3e81f5a922ccfbe4b5e4a1ffa49bd
parent 04057e5d14030ef54c522b2372019cf2858083e9
parent aee7f64c10ffd2135dc98f7a540836ad7a32438b
author Narayan Kamath <narayan@google.com> 1423829371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423829371 +0000

am aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."

* commit 'aee7f64c10ffd2135dc98f7a540836ad7a32438b':
  Remove code that sets user.* system properties.