tree 844c165b618e730c3212770379745ab950d344f2
parent c665f548ba6d67beedff1b3ddd9f372cb29b0cb4
parent 82347efc976bff9e173dd8f681921bf51a0e34fc
author Nan Zhang <nanzhang@google.com> 1532478100 -0700
committer android-build-merger <android-build-merger@google.com> 1532478100 -0700

Merge "Use android.jar from Metalava." am: e973f6de0f am: 7ef23e5e55
am: 82347efc97

Change-Id: I4155b00936a0cfdc7e6c67ec9b7bf617bf884af2