am f7c76220: Merge "Support photoviewer backport." into jb-ub-mail-ur10

* commit 'f7c76220caa56b7f65ed9520a61813b8539373f2':
  Support photoviewer backport.
This commit is contained in:
Andrew Sapperstein 2013-08-21 18:41:33 -07:00 committed by Android Git Automerger
commit 8ee6266c81

View File

@ -22,7 +22,7 @@ include $(CLEAR_VARS)
# Include res dir from chips, unified, emailcommon, and photoviewer # Include res dir from chips, unified, emailcommon, and photoviewer
chips_dir := ../../../frameworks/ex/chips/res chips_dir := ../../../frameworks/ex/chips/res
unified_email_dir := ../UnifiedEmail unified_email_dir := ../UnifiedEmail
photo_dir := ../../../frameworks/opt/photoviewer/res photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
emailcommon_dir := emailcommon emailcommon_dir := emailcommon
res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res