tree 31930a291c99fe616059e735ef57023eff11a9c7
parent b7a7edac029225a991413474298647e26b80077c
parent 0e99097b400ccf69d3092bc993e8644be5d50c85
author Stephen Hines <srhines@google.com> 1440672571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672571 +0000

am 0e99097b: (-s ours) am 7955d942: am d5e8c3c9: Merge "Fix missing call to setLinkRuntimeCallback() from compat path."

* commit '0e99097b400ccf69d3092bc993e8644be5d50c85':