OSDN Git Service

Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
authorJohn Reck <jreck@google.com>
Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Feb 2013 00:01:06 +0000 (00:01 +0000)
commitad16c6799d559d304bb8688e37a02d2d9bc53a42
tree41eaca93b6cdc1f1269fef682f3820a15ffed2e5
parent04026a407aca122132ce746a675ac20782f3ab08
parent54987e8d3af88214ce4f3aed0b5c4e9ded5b1392
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java