tree 28db50287d44ec9c5595dfb1a169a0996cefc7d3
parent 823228febc7c9b43be9ed84d96202af293377a3e
parent 727f8307577b813959f6a4a0fd48ba20c880c98e
author Tony Mantler <nicoya@google.com> 1440438815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440438815 +0000

am 727f8307: Add proguard rules to v7/preference

* commit '727f8307577b813959f6a4a0fd48ba20c880c98e':
  Add proguard rules to v7/preference