tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 62aa7a9b8dca7be9e51f245fe7af0ba0a775a3bf
parent afe6d85b3921fec79bcdc11d80edf9befd4f559f
author Adam Cohen <adamcohen@google.com> 1392411514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411514 +0000

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

* commit 'afe6d85b3921fec79bcdc11d80edf9befd4f559f':