OSDN Git Service

Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
authorFan Zhang <zhfan@google.com>
Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)
commitdd3e2c4f27d29c7386c54865ccb2ec3c198f8095
treeaec0017dc951c717f79bdbfd51ab32eac12dd5a0
parent974ace22f9a3bf7591257a08328917dae8624be3
parent3905ad125d990557d8f02cbb51994eb0366a45be
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782