| commit | 355e075a2cf7a97acce2102a7ccc46b28861031f | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 20:35:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:35:27 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | cbe28fb700d18b2ab2348534c2ccafb035382dc5 [diff] | |
| parent | 91e18ddec4bb9eb3b41d2bc29343360fdbf270e5 [diff] |
am 91e18dde: am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose * commit '91e18ddec4bb9eb3b41d2bc29343360fdbf270e5':