tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent d9a65cffe3e3b48bf97b4b07c09aba267605251f
parent 043d74855cc1cd4fe06d4b98a46f25cad020dd4b
author Tom Stamm <stammt@google.com> 1392411536 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411536 +0000

am 043d7485: am af787b56: 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 '043d74855cc1cd4fe06d4b98a46f25cad020dd4b':