tree 246ad8616c9d63583f32039e2450ec213296bd53
parent 3bec50908b8438c04a654a3bb806f05a01402ce7
parent 4c488ff931fe6b2fc79ef854febc98b4cb748402
author Adam Lesinski <adamlesinski@google.com> 1417564249 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417564251 +0000

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