tree 15fdd7df1fd7501388879d6350d10fc34914392f
parent a5baf56e6ced81008a2bf994e5b4797d39b18e03
parent 7edfe29e8f6a55fb491f36a6c31c9ecddb7f9b5a
author Nan Zhang <nanzhang@google.com> 1519341068 +0000
committer android-build-merger <android-build-merger@google.com> 1519341068 +0000

Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8
am: 7edfe29e8f

Change-Id: I1ef8af667a806ead8c4098bbdab12d377e8fd7b1