commit | 5af5f7a854ed0bdebf7b7df5f797075d19cbe9c0 | [log] [tgz] |
---|---|---|
author | Alexander Smundak <asmundak@google.com> | Thu Feb 07 15:44:48 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 07 15:44:48 2019 -0800 |
tree | 7fad6c01ce35d0b944bcddccf21ea590925d96fd | |
parent | dd4895f5b42aba88f413ace3f72082d6ba6b69b6 [diff] | |
parent | 9624d834836b90a3fd7c609328d84706319f2932 [diff] |
[automerger skipped] Merge "Provide java_defaults as a counterpart to the settings.mk file" am: ad8b5c9939 am: 9870b5659b am: 9624d83483 -s ours am skip reason: change_id I9e57744737430ff7e1ab57891dc81d1dd3bbcb83 with SHA1 0f019d083e is in history Change-Id: Ibedddae9ccee535136acc493b64f8412388b239b