tree 03e52035f339bbc5189aabc3a2d9469fac1a51f1
parent 2e317f2ccd72e192cfcd3b057e57ef0f1d559880
parent ec99f609cc2db862db307f7ba56a2400c58403a0
author Jeff Brown <jeffbrown@google.com> 1328237572 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328237572 -0800

am ec99f609: Merge "Rename CancellationSignal using preferred spelling."

* commit 'ec99f609cc2db862db307f7ba56a2400c58403a0':
  Rename CancellationSignal using preferred spelling.