tree f10ee52a9b1614f819aa03a4b581c0bbed01bfa9
parent edf2240c7f3b0af25d407d63e3cfd5ae7d5372e5
parent 693080efdafbf49d675fe5f959f0286f83b30c81
author Jason Sams <rjsams@android.com> 1296071673 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1296071673 -0800

Merge "Migrating functions for on device linking." into honeycomb