tree f1ef9b52acc8cbae4e112c2af7808cbe18a9d063
parent 3fc95a991805feba257a396c13548776fd36f34f
parent 00f0691107dfde589bd23a7d079b4e05998833b0
author Jean-Baptiste Queru <jbq@google.com> 1345565532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345565532 -0700

am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test"

* commit '00f0691107dfde589bd23a7d079b4e05998833b0':
  Fixing unused param warnings in sync_test