tree 7688c4a7448f89b247e803a867f5dfe3b8d71eed
parent bda1c3d6e4fcb57ee1b7f26cced4bf0655d5531d
parent a000b5aa6635faf6c2bc10ff1ed7967d0595ceff
author Treehugger Robot <treehugger-gerrit@google.com> 1493931717 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1493931720 +0000

Merge changes from topic 'upgrade-smali'

* changes:
  Update smali/baksmali to 2.2.0
  Merge remote-tracking branch 'aosp/upstream-master'