tree 150df27e2fa1312ce47a31118e4a74364b0ea332
parent 0c220a6bb412c0ee2326ff4084094d8f9a22685b
parent 1e526b15b8bd2b9c067688e143ab38748adbd008
author Tony Mantler <nicoya@google.com> 1440439512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440439512 +0000

am 1e526b15: am 6ef35156: am 727f8307: Add proguard rules to v7/preference

* commit '1e526b15b8bd2b9c067688e143ab38748adbd008':
  Add proguard rules to v7/preference