Jean-Baptiste Queru 926d1a2200 am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt
2009-12-10 17:57:04 -08:00
..
2009-09-03 15:19:21 -07:00
2009-11-16 17:59:32 -08:00