OSDN Git Service

Merge "Add camera-related tests back." into gb-ub-photos-carlsbad
authorSascha Haeberling <haeberling@google.com>
Fri, 9 Aug 2013 23:03:56 +0000 (23:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 23:03:56 +0000 (23:03 +0000)

Trivial merge