am 1cd7d347: am 0b060097: Merge "Use the prebuilt support library resources" into ub-mail-master

* commit '1cd7d3473bade372e01474ef03e003c3af5c3658':
  Use the prebuilt support library resources
This commit is contained in:
Paul Westbrook 2014-07-24 23:32:47 +00:00 committed by Android Git Automerger
commit 2c7a92ad48

View File

@ -24,7 +24,7 @@ chips_dir := ../../../frameworks/opt/chips/res
unified_email_dir := ../UnifiedEmail unified_email_dir := ../UnifiedEmail
photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
emailcommon_dir := emailcommon emailcommon_dir := emailcommon
gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res
bitmap_dir := ../../../frameworks/opt/bitmap/res bitmap_dir := ../../../frameworks/opt/bitmap/res
datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)