tree 50b72c88967bb2dce2bf951ce69c94e746e7dcc2
parent 691a8a6193fbce96d7e12e99d72dc68253d9b4c5
parent a769c2b2b13bff94cf21deada89f0ededac6a2b2
author Eric Fischer <enf@google.com> 1287693753 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287693753 -0700

am a769c2b2: am 2acd43d3: Replace shared storage with USB storage.

Merge commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2'

* commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2':
  Replace shared storage with USB storage.