tree 1c5f8c34128fb6aee86edea975aceb6933f089e1
parent 475e5357e53a9457685051838ffc594840bc6fea
parent 7c96332354d391b7b4d14e44eee29743ac115592
author Nan Zhang <nanzhang@google.com> 1529351823 -0700
committer android-build-merger <android-build-merger@google.com> 1529351823 -0700

Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54 am: 0da95a5d64
am: 7c96332354

Change-Id: Iea928b33e984049904ca0fdba4923ee06cfd5971