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)
commitace62b69bd53518faea7be986f6c7481b271ca3f
tree174afc2cc483ec2575bccd32e413c927fc5e9b79
parentd87305a547d614d47af48886d7e1c616ad20336e
parenta3dc2c0dd75f4659146fcd257ce32acc3800ae5f
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Android.mk
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java