Google Git
Sign in
android/platform/external/e2fsprogs/refs/heads/ics-mr1
commit
d5f550bb2f556c5d287f7c8d2b77223654bcec37
[log]
author
David 'Digit' Turner <[email protected]>
Wed Jul 13 14:55:30 2011 -0700
committer
Android Git Automerger <[email protected]>
Wed Jul 13 14:55:30 2011 -0700
tree
6fc77f310747adc4bace85a7595508c1ffadb72a
parent
0b0dd1ca591da7b2d0200e37174affe549bdd302 [diff]
parent
e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72 [diff]
am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aosp

* commit 'e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72':
  Change systembuilder tag to optional
tree: 6fc77f310747adc4bace85a7595508c1ffadb72a
  1. config/
  2. contrib/
  3. debian/
  4. debugfs/
  5. doc/
  6. e2fsck/
  7. ext2ed/
  8. include/
  9. install-utils/
  10. intl/
  11. lib/
  12. misc/
  13. po/
  14. resize/
  15. tests/
  16. util/
  17. .missing-copyright
  18. .release-checklist
  19. ABOUT-NLS
  20. aclocal.m4
  21. Android.mk
  22. CleanSpec.mk
  23. configure
  24. configure.in
  25. COPYING
  26. depfix.sed
  27. e2fsprogs.lsm
  28. e2fsprogs.spec
  29. e2fsprogs.spec.in
  30. INSTALL
  31. INSTALL.elfbin
  32. Makefile.in
  33. MCONFIG.in
  34. MODULE_LICENSE_GPL
  35. README
  36. RELEASE-NOTES
  37. SHLIBS
  38. SUBMITTING-PATCHES
  39. version.h
  40. wordwrap.pl