| commit | 1214470a617e31d65f8efe507143945a428be5b8 | [log] [tgz] |
|---|---|---|
| author | Tenghui Zhu <ztenghui@google.com> | Mon Oct 14 17:19:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 17:19:57 2013 -0700 |
| tree | 46900c0007b7518a162f5b18b1650ad54925921f | |
| parent | 74ea45fa511977cc579ef4b78ceb413a6312793a [diff] | |
| parent | 94678fc1d2b5235cfeae360ca2567579e8fed848 [diff] |
am 94678fc1: am db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad * commit '94678fc1d2b5235cfeae360ca2567579e8fed848': Revert "Play the video on top of lock screen"