tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a671c28cbfbb524a164e665fea0c27beea328708
parent af787b5607c5a25779e49f6ce94a6cb73601d227
author Tom Stamm <stammt@google.com> 1392411041 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411041 +0000

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 'af787b5607c5a25779e49f6ce94a6cb73601d227':