OSDN Git Service

am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO...
authorTenghui Zhu <ztenghui@google.com>
Mon, 5 Nov 2012 23:59:31 +0000 (15:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:59:31 +0000 (15:59 -0800)
commitde40420c1c0d3a134a9544a2270e27a4933e5b21
tree3a5f097a20836ab85a99a015604ce2d66773866e
parentf8981654575b21ee7eaf153b2078db1300fdeb72
parent50d8215190ced5537ef477b2721cfde053cb1848
am 50d82151: 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 '50d8215190ced5537ef477b2721cfde053cb1848':