| commit | 04925cca77d7b7d3a1a71c0d581e5c78793148e4 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 23 17:26:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:26:55 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 09ecb8342f64cc5238618b8e6b35e1e5e97e66da [diff] | |
| parent | afe6d85b3921fec79bcdc11d80edf9befd4f559f [diff] |
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':