OSDN Git Service

am 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background...
authorTenghui Zhu <ztenghui@google.com>
Tue, 30 Oct 2012 22:21:06 +0000 (15:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 22:21:06 +0000 (15:21 -0700)
* commit '3245b90f56edac635a3bcf7963d71a125d3b4312':
  DO NOT MERGE: Do not set the background to null for video.


Trivial merge