tree 69ec59de282834be17b1795b2f7b1389acfc75b3
parent 72a6af1ab13fbcb98598b0e11b0bb3b069d30635
parent ccfd99b1e2a64c72ec433ebf5cf98d644ab24614
author The Android Open Source Project <initial-contribution@android.com> 1273700500 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273700500 -0700

am ccfd99b1: merge from open-source master

Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken

* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
  Support for User to User Signaling (UUS)