tree 171ab7bbc0b91c319859c7f82a8332953ec128f1
parent 384fb175762de7ef5f13e2cd5eb6247a7ea25e67
parent 2347b2335b26edc5b7145759cc8a727fc712b970
author Joe Onorato <joeo@android.com> 1267497255 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267497255 -0800

am 2347b233: am 4700fed7: Maybe this will silence http://b/2460740

Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970'

* commit '2347b2335b26edc5b7145759cc8a727fc712b970':
  Maybe this will silence http://b/2460740