tree 0685ce5604f7f6198a6d74846055ea5dc2d6adc7
parent 6fc682025b6cee8af6d6d48242d2591dfa4d4a55
parent d7a6d8613c9e97649a89569aca711e64233bb38e
author Jason Noguchi <jnoguchi@google.com> 1360897316 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1360897316 +0000

Merge "Merging camera test with gallery test." into gb-ub-photos-bryce