tree f5a2a3299547dcb53e5b83aa721ce93bd454db2b
parent 1ae33e37b712aa6dabdd6697a7bf1833f7ecff0b
parent 0f0c61b5716730b58e821451356975c60fd8cfb1
author Orion Hodson <oth@google.com> 1513893469 +0000
committer android-build-merger <android-build-merger@google.com> 1513893469 +0000

Merge "dx: Extend descriptors used for signature polymorphic methods" am: a8b3e6b07e
am: 0f0c61b571

Change-Id: I2f62d9611ac814beba708f2d43f6aad6064f3340