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