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