[automerger skipped] Merge "Enable api-versions.xml generation for api-stubs" am: 7cba8a7fe4 -s ours am: 99cf8bca41 -s ours

am: b2a090de57  -s ours

Change-Id: I906b5172c5a5dbdbe31323ede61ce1d39bf1921a
This commit is contained in:
Nan Zhang
2018-09-19 09:25:51 -07:00
committed by android-build-merger

Diff Content Not Available