tree 49a87524518cbcc17c490818c24ceb19837ce0c7
parent d08f5716b42c5c409ea9774066f8321cdf345200
parent ed0e427861ee43cac8d74789faa0101d28fd5d67
author Tony Mantler <nicoya@google.com> 1445011236 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445011236 +0000

Merge "Update proguard config to keep base Preference class" into mnc-ub-dev