tree 31930a291c99fe616059e735ef57023eff11a9c7
parent de7d4b1a31c273ae9e5e7d498cbe465498d7f4aa
parent 6aed2d8d1538e2afc66afe256cfa06c090dec722
author Stephen Hines <srhines@google.com> 1440672579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672579 +0000

am 6aed2d8d: (-s ours) am d4777717: Fix missing call to setLinkRuntimeCallback() from compat path.

* commit '6aed2d8d1538e2afc66afe256cfa06c090dec722':