tree 3d3937a2e4b5fe7164ba403ddfd6dd8f0f025584
parent 579a34186f801f7d70ac05feb380b1a3480e6d31
parent a130ad32c38189531e2ee7ba2813921a346118fc
author Adam Cohen <adamcohen@google.com> 1380567926 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380567926 -0700

am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose

* commit 'a130ad32c38189531e2ee7ba2813921a346118fc':
  Trying to get onShow in all the right places