tree 53e8ba5a33270814a3df2bf493967a8eb15ca33f
parent 504acc06a865d5b0e2d3e08111ffe71ccea8ca26
parent 267cf99aae855d3d8cbd2b919f3e9aeceabfb7c3
author Alex Light <allight@google.com> 1460151725 -0700
committer Alex Light <allight@google.com> 1460151725 -0700

Merge commit 'refs/changes/32/214432/1' of persistent-https://android.git.corp.google.com/platform/external/smali into incr-dex

- Merges in upstream smali into nyc-dev for dex version 37 support.

Bug: 27809626

Change-Id: Iff12b1e384355bcb261b55afd16af3bcac6ef1a0