OSDN Git Service

am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do...
authorTenghui Zhu <ztenghui@google.com>
Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)
commit50d8215190ced5537ef477b2721cfde053cb1848
tree3a5f097a20836ab85a99a015604ce2d66773866e
parentdf8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b
parent2f09f14ea0b9314fe3ad69a54866ddfa383c8c82
am 2f09f14e: 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 '2f09f14ea0b9314fe3ad69a54866ddfa383c8c82':