tree 2f990c06cfd51c203f93c7f9ca24e4385cc46692
parent a4a5ec5e748f99c40301c9c422b3d36cb44c6081
parent e361ca6428e137410ab828f5dee6148b8bdc29b3
author Jason Sams <rjsams@android.com> 1296071828 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296071828 -0800

am e361ca64: Merge "Migrating functions for on device linking." into honeycomb

* commit 'e361ca6428e137410ab828f5dee6148b8bdc29b3':
  Migrating functions for on device linking.