tree 5956d05cc17b7be0a9e91509dab691d4f334b4e7
parent bcdb6d63303896ee28eb2b7611b14d5ad41a0f85
parent 10e53ffbd584d593f82734cef573bc7de8e1d6f0
author Nan Zhang <nanzhang@google.com> 1532478563 -0700
committer android-build-merger <android-build-merger@google.com> 1532478563 -0700

Merge "Wrap private-stub-annotations in android.jar" am: d5814e0760 am: c35a0c7ae3 am: 48243d9414
am: 10e53ffbd5

Change-Id: Idb2aa547fe5fc88de43daca0d8804a8605d2945c