OSDN Git Service

Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf...
authorFan Zhang <zhfan@google.com>
Wed, 13 Feb 2019 18:43:46 +0000 (10:43 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Feb 2019 18:43:46 +0000 (10:43 -0800)
am: 798c93aafc

Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec

1  2 
Android.mk

diff --cc Android.mk
Simple merge