tree 703fe39bef002c6746aeee42b84b1597fe6ca7ad
parent bcb7bad6115a4b64e1cf570ec366b4de74025e4c
parent 23e7a4db417f0ca364db4cb3b3ddba7bd4f052a8
author Nick Kralevich <nnk@google.com> 1287038099 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287038099 -0700

am 23e7a4db: am 5e26d64d: disable proguard.  This makes unittests run.

Merge commit '23e7a4db417f0ca364db4cb3b3ddba7bd4f052a8'

* commit '23e7a4db417f0ca364db4cb3b3ddba7bd4f052a8':
  disable proguard.  This makes unittests run.