OSDN Git Service

am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the...
authorTenghui Zhu <ztenghui@google.com>
Tue, 30 Oct 2012 22:21:55 +0000 (15:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 22:21:55 +0000 (15:21 -0700)
commit2f09f14ea0b9314fe3ad69a54866ddfa383c8c82
tree698300452d45af7923536ffac2bfcc994b2d6188
parent368127e5815811ffdc9181ca9ba4114c5b27a412
parent3245b90f56edac635a3bcf7963d71a125d3b4312
am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '3245b90f56edac635a3bcf7963d71a125d3b4312':
  DO NOT MERGE: Do not set the background to null for video.