commit | 798c93aafccf63c0831e9396802da653e771cc6b | [log] [tgz] |
---|---|---|
author | Fan Zhang <zhfan@google.com> | Wed Feb 13 10:29:46 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 13 10:29:46 2019 -0800 |
tree | d1ee160bb028f52885fa0afc57284f114153a25d | |
parent | edc4fd30ead56da811a3e8479ebac19407dcf4e6 [diff] | |
parent | 32fbf4740d5895233d2324fe26ba03421ce92dac [diff] |
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d