tree f965ecbc07418285190ae7805d4f7a27d5c8d9e1
parent 350cad7c9b0335feeb28b1284397d722f5956885
parent b849b2cdbefa09ccbdcc068927ba48ba29f90e0f
author Nan Zhang <nanzhang@google.com> 1532478525 -0700
committer android-build-merger <android-build-merger@google.com> 1532478525 -0700

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

Change-Id: I79a34ec49db07742e2dfd6ae7cd0af2b686d4770