tree e11517989811fc3e2b9460209fd454a41c3238a5
parent 0788b14b3b90964455a907dc673e292390990a8e
parent 14ff6c8df2924ccad083591c0fc873322c6828c0
author Sascha Haeberling <haeberling@google.com> 1386989069 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386989069 +0000

Merge "Add placeholder image support." into gb-ub-photos-denali