tree 3d3937a2e4b5fe7164ba403ddfd6dd8f0f025584
parent 0655904abd2e67f3c4c5b9e8e57cee6f8f562076
parent 89cbbb9d2e6885f176d59d8e7476a4001fe6e7f5
author Adam Cohen <adamcohen@google.com> 1380567670 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380567670 +0000

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