| commit | 32e2ff45a3e1daecbee9d04eb77c28b04e14ef86 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Sat Jan 31 02:01:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:55 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | c7eb68d38b1a013dc8820b16d251019e8ba989bd [diff] | |
| parent | e4e11d49f6bb7479cf563833ddb89a28b771dc86 [diff] |
am e4e11d49: am 7c938d99: am 55f77f98: Merge "Showing clings only after the intro has completed" into ub-now-porkchop * commit 'e4e11d49f6bb7479cf563833ddb89a28b771dc86':