tree 95f8b3ee4cb1ee84005fb30905219bea835d3202
parent 7841c35b18374dc295024d1022253d453aa501e3
parent a74541f3ad7904334ebe97294b05dba23f00cd9b
author The Android Open Source Project <initial-contribution@android.com> 1348170532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348170532 -0700

am a74541f3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a74541f3ad7904334ebe97294b05dba23f00cd9b':
  Bring back ADB_EXTERNAL_STORAGE.