tree 8b761a8db3c8683ebf6b39e926c1ebff4ad12f27
parent f9b8e9018bf8ab012ec734262620d3274b2cd2ec
parent 9150cff64abc79927ade28061ac99a1ebf812905
author Jean-Baptiste Queru <jbq@google.com> 1280444350 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280444350 -0700

am 9150cff6: Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"

Merge commit '9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp

* commit '9150cff64abc79927ade28061ac99a1ebf812905':
  Replaced /sdcard with Environment.getExternalStorageDirectory()