tree 1eeae3888d61720a9d7869d3f9d5ad4ef04c89c7
parent 363ca871c75c21066b70239f761917feb043730c
parent 3ce2454cf75499317caf0c2b19ea0787a1c0af4a
author Andreas Gampe <agampe@google.com> 1444241447 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444241447 +0000

am 3ce2454c: (-s ours) Merge "Revert "Temporarily disable due to python-related build issues""

* commit '3ce2454cf75499317caf0c2b19ea0787a1c0af4a':
  Revert "Temporarily disable due to python-related build issues"