| commit | f93a49422ba1516492a29f0563285d06d079404e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 12 13:57:11 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 13:57:11 2010 -0700 |
| tree | 36b2212b819b45708aa25090a7a9e5a711dd652d | |
| parent | 76275ac1c53585a374b5e5f1834631fca9392dd8 [diff] | |
| parent | e90cc3ba6c6ccd383f31b539367c2cccea278fed [diff] |
am e90cc3ba: resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp Merge commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed' * commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed': Replaced /sdcard with Environment.getExternalStorageDirectory()