tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 32b3fdc1dcac61af9dfc6bca00c12757c38880e5
parent 3b50e6948b97af10de9e9af276b8e830319dd95e
author Tom Stamm <stammt@google.com> 1392410151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410151 +0000

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

* commit '3b50e6948b97af10de9e9af276b8e830319dd95e':