tree dc76a21916582a08115a4bd70d719939e9cd1e6b
parent fbb57e6db24d2cd58b3409e672a690c71a507a65
parent 4127448aa7d8e7ed387df57122fa349538900462
author Nan Zhang <nanzhang@google.com> 1537319920 -0700
committer android-build-merger <android-build-merger@google.com> 1537319920 -0700

Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master am: f46a3a3acc
am: 4127448aa7

Change-Id: I1a308ab34a49a94241bc3989f8109526a184a18f