tree 4601d43bccab2e23ef4dbbed4fb96338f7efe0bf
parent ba57cabeac296e617caf73e38837e722b0b61a65
parent 67a40e08c6a24866dd11299c05458323a8eacafb
author Tom Stamm <stammt@google.com> 1380839717 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380839717 -0700

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

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