tree e2627139567b000244e73a3adc2f81df3b5a73f6
parent b4cd2e4135a574858769d8bd3fa47cbb34ea9add
parent ad8b5c993948cf696d4dfcaa5d636b6d3d4f3c62
author Alexander Smundak <asmundak@google.com> 1549581717 -0800
committer android-build-merger <android-build-merger@google.com> 1549581717 -0800

Merge "Provide java_defaults as a counterpart to the settings.mk file"
am: ad8b5c9939

Change-Id: Ia4e52707d858457ebbcfdaa14c27b978eee7f4d1