OSDN Git Service

Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38
authorTakamasa Kuramitsu <takamasa.kuramitsu@sony.com>
Sat, 2 Mar 2019 00:52:30 +0000 (16:52 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Mar 2019 00:52:30 +0000 (16:52 -0800)
commit08415faf4a4ce2dcbe44515d5d7adfd3205873cd
tree91a68818d71c488b9ac4b644932be17169e6df07
parent641ea6e4fa5db2aee169575ee942538c6fc0daa8
parentb496699104e0b444fbb2bdfb73dbbe8d711f8442
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38
am: b496699104

Change-Id: I4ad127ad793b1c154af8536b8b989aafd283e787