tree aea2ccbfeeeae4f2415dc672815ccac069e31ce5
parent eefd3beb21985af2df4e687cf0e62185657d8066
parent b668d06f9447b613f6e8e65817e12ccd8d2b6225
author The Android Open Source Project <initial-contribution@android.com> 1340111783 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340111783 -0700

am b668d06f: Reconcile with jb-release

* commit 'b668d06f9447b613f6e8e65817e12ccd8d2b6225':
  Revert "Added addr field in response of Jewel command"