tree a0b7e0943d0ac21b9fef5972302011ddaa2c152e
parent 233d700efc5f308fe32acc5984b636860e4fc7b0
parent f17611a29e3b0d0c7a5d28a1ce92682a2c097de6
author Adam Lesinski <adamlesinski@google.com> 1417565133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417565133 +0000

am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

* commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6':
  AAPT: Add custom transition classes to Proguard keep set