tree c483c9b79e436651a7705372c68fd0f90eeb26ca
parent 50deee78dac8de5662ba0edf82a313f4953fd5d7
parent 681222d39137afb0bcfa88e17fc3a5fbdfe7a4c3
author Ben Gruver <bgruv@google.com> 1516739271 -0800
committer Ben Gruver <bgruv@google.com> 1516745050 -0800

Merge smali upstream into master

Test: m checkbuild
Change-Id: Iae6fd24aa23816047d2bcd14f2e9f26a01e3d681