tree 6b38f8aa9f4bb9afa42b614fe1a385a94e60a404
parent 07d7baf36c7dd27e40c5ec3a50aaeed85960ca44
parent 520267b93feb4df1e923576d69efbb6d63529c02
author Nan Zhang <nanzhang@google.com> 1536793076 -0700
committer android-build-merger <android-build-merger@google.com> 1536793076 -0700

Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065 am: b910944852
am: 520267b93f

Change-Id: I71efe4a921fe3a03f90b90870b400d242acf5eb1