tree df3a820935509dc882e989942ce40624e24f3262
parent a2c5f805f838b31fbbeb248aa021e0cf0c758d7b
parent b40f5d724d7ee13d54246f5794375c3c9945f90a
author John Reck <jreck@android.com> 1354911718 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354911718 -0800

am b40f5d72: am 2524fd28: Merge "Fix leak of inspectorClient when INSPECTOR disabled"

* commit 'b40f5d724d7ee13d54246f5794375c3c9945f90a':
  Fix leak of inspectorClient when INSPECTOR disabled