commit | fe8757b9957264c4bfde40a2067252e9a33e2ada | [log] [tgz] |
---|---|---|
author | Chris Banes <chrisbanes@google.com> | Wed Nov 18 19:51:17 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 18 19:51:17 2015 +0000 |
tree | 299d97e24be6058d3fca867bce52936c507c8e5b | |
parent | 0ed4899a86485dcffe5f70f62e50980f1f550549 [diff] | |
parent | ed517aef171d2b5327b45f9b74ccf616d56ad40a [diff] |
Merge "Make sure we keep Annotations in design's proguard" into mnc-ub-dev