tree abb0b721d3850d61066aa53850ff179117fbdf56
parent bbc0bd4936ee8b59631d8408e3009800f6e89ef9
parent b97c2f0b5919b716ba5433e6153a29d7e1e357fe
author Vladimir Chtchetkine <vchtchetkine@google.com> 1315842678 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315842678 -0700

Merge "Fake camera implementation"