commit | 65b1c3d4b5b14012ed9e7952ad35f75a714a2774 | [log] [tgz] |
---|---|---|
author | Yuli Huang <yuli@google.com> | Fri Nov 11 06:36:40 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 11 06:36:40 2011 +0000 |
tree | 87c4ea79463f6283300e21d9680f33b173ef14cd | |
parent | a28f9aab0c8f704eaf02e05a364b29601164a219 [diff] | |
parent | c9ac7f1c5e5b5d665aad8919ab98645b9a18a28e [diff] |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.