tree 98f64a37be4c650e746814a7d633a1a2f684a7ad
parent f4e232bfc600d14a7700a7bb5bf5a4d1267141c9
parent 1df84d1eb0db623e0de639eac6dd41de48a100bd
author Nan Zhang <nanzhang@google.com> 1523925647 -0700
committer android-build-merger <android-build-merger@google.com> 1523925647 -0700

Merge "Convert dx droiddoc module to Soong." am: 25124d0f46
am: 1df84d1eb0

Change-Id: I9f808cbefd70e37e70eb6eef20696e2500bbde7c