| commit | 7cfa6837c469415d8ae6a0a30b525ae8ea2196ee | [log] [tgz] |
|---|---|---|
| author | Tom Stamm <stammt@google.com> | Wed Oct 29 07:02:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:02:13 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 9f608c92f43398155272ef01642c3a40acda9cc2 [diff] | |
| parent | 3bcf5892c7206fa4653c65fd49553c2f9d144daa [diff] |
am 3bcf5892: am 043d7485: am af787b56: am 3b50e694: am 67a40e08: am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose * commit '3bcf5892c7206fa4653c65fd49553c2f9d144daa':