tree 7112e5b2c09c3291b0c8314966e515d3c23231b3
parent ccd7c2fd64dfe665e7798f101367d5dbd468d4e4
parent b3c6951e15865ac5a9007d281e12f380a16967e8
author Yorke Lee <yorkelee@google.com> 1385404952 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385404952 -0800

am b3c6951e: Merge "Fix Dialer tests"

* commit 'b3c6951e15865ac5a9007d281e12f380a16967e8':
  Fix Dialer tests