tree dc021e08f0108c95a1264f5b1e723d283700c8ea
parent a04ce8904598cf2a1614472201a8b9609dd2ef2a
parent 344ec42ee64713bce0f8a9bf37979a9d2518992d
author Nancy Chen <nancychen@google.com> 1405983329 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405983329 +0000

am 344ec42e: am b17cb363: am bbde565a: Update call settings to mocks

* commit '344ec42ee64713bce0f8a9bf37979a9d2518992d':
  Update call settings to mocks