summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-01 19:36:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-01 19:36:45 -0800
commitf6aaa2a6642ec7f62883c67f9a7a80122c84747a (patch)
tree4719999d85b7a30f196ff5ae0574c29cfdcdb32b /res
parent331e359ca938ddae3be6409537f6f8d239ee05b5 (diff)
parent314ba18d434bcea2181158bc4b6d2cc223c6a734 (diff)
downloadpackages_apps_LegacyCamera-f6aaa2a6642ec7f62883c67f9a7a80122c84747a.zip
packages_apps_LegacyCamera-f6aaa2a6642ec7f62883c67f9a7a80122c84747a.tar.gz
packages_apps_LegacyCamera-f6aaa2a6642ec7f62883c67f9a7a80122c84747a.tar.bz2
am 314ba18d: (-s ours) am b3babe73: Merge "Fix NPE in releaseMediaRecorder. do not merge" into gingerbread
* commit '314ba18d434bcea2181158bc4b6d2cc223c6a734': Fix NPE in releaseMediaRecorder. do not merge
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions