tree 85c4c5d7cdef79224d862dda095b243412bafdc0
parent e5080343aeb80f28bf8318b234e9ae13ddb6d46d
parent 4a62374544152d9cc6dafd3e8dd9b0ba475a974c
author Romain Guy <romainguy@google.com> 1357587337 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357587337 -0800

am 4a623745: Merge "Fix issue when toggling profiling from visual to off to visual"

* commit '4a62374544152d9cc6dafd3e8dd9b0ba475a974c':
  Fix issue when toggling profiling from visual to off to visual