tree 4601d43bccab2e23ef4dbbed4fb96338f7efe0bf
parent be7049a99cb6f15294f49b7e3de51ada352d486e
parent 339b0ec914d4ec3863aba1cba7329a2e69a308e2
author Tom Stamm <stammt@google.com> 1380839457 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380839457 -0700

am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose

* commit '339b0ec914d4ec3863aba1cba7329a2e69a308e2':
  Trying to come up with a simpler approach for onShow/onHide.