tree 366bd923a2ee4969824c2a8e6ddfbdda6c858e4d
parent 2f8f73e98c29d5d750112aaada42d252d1494731
parent da5d25cac5ed09117d03abdc1aec8e4b848d7067
author Nan Zhang <nanzhang@google.com> 1526442261 -0700
committer android-build-merger <android-build-merger@google.com> 1526442261 -0700

[automerger skipped] Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed31
am: da5d25cac5  -s ours

Change-Id: Ic67fee194b491d4fa1868e9022dcee4c1086967f