Commit Graph

2395 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
1b683a4104 AI 143391: Merge from donut Change 143255
Automated import of CL 143391
2009-03-27 19:49:17 -07:00
Karl Rosaen
c61d318e8f AI 143377: am: CL 143227 am: CL 143046 Add extra pixel on right and left in 9 patch for expanders to fix padding problem
Original author: krosaen
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143377
2009-03-27 19:34:33 -07:00
Karl Rosaen
b6d49645b1 AI 143227: am: CL 143046 Add extra pixel on right and left in 9 patch for expanders to fix padding problem
Original author: krosaen
  Merged from: //branches/cupcake/...

Automated import of CL 143227
2009-03-27 19:28:16 -07:00
Dianne Hackborn
5e152c185e AI 143354: am: CL 143203 am: CL 142986 Work on issue #1739922 (Removed unused resources). We don't seem to use these.
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143354
2009-03-27 19:07:32 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -07:00
Dianne Hackborn
7ae5afc473 AI 143203: am: CL 142986 Work on issue #1739922 (Removed unused resources). We don't seem to use these.
Original author: hackbod
  Merged from: //branches/cupcake/...

Automated import of CL 143203
2009-03-27 17:49:19 -07:00
Jean-Baptiste Queru
bf62297bd1 AI 143296: Merge from donut Change 143147
Automated import of CL 143296
2009-03-27 17:43:53 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Dianne Hackborn
88fb1069bf AI 143147: Manual integration
Automated import of CL 143147
2009-03-27 14:59:22 -07:00
Dianne Hackborn
499e098f0c AI 143101: Fix issue # 1741546 (Put back private resources used by maps.)
BUG=1741546

Automated import of CL 143101
2009-03-27 09:53:15 -07:00
Karl Rosaen
3f2fd987b2 Automated import from //branches/cupcake/...@143046,143046 2009-03-26 19:20:36 -07:00
Dianne Hackborn
f473433e4d Automated import from //branches/cupcake/...@142986,142986 2009-03-26 14:39:43 -07:00
Dianne Hackborn
73fbd70263 Automated import from //branches/cupcake/...@142829,142829 2009-03-25 18:37:33 -07:00
Eric Fischer
61be3ae696 Automated import from //branches/donutburger/...@142720,142720 2009-03-25 17:04:27 -07:00
Raphael Moll
3aadcd9ed4 Automated import from //branches/donutburger/...@142710,142710 2009-03-25 16:33:12 -07:00
Eric Fischer
fea44a0cc2 Automated import from //branches/master/...@142759,142759 2009-03-25 16:13:51 -07:00
Karl Rosaen
cf58974d66 Automated import from //branches/donutburger/...@142698,142698 2009-03-25 16:01:38 -07:00
Raphael Moll
0704009786 Automated import from //branches/master/...@142746,142746 2009-03-25 15:58:47 -07:00
Karl Rosaen
c06a594d85 Automated import from //branches/master/...@142737,142737 2009-03-25 15:49:02 -07:00
Eric Fischer
b784f21c2b Automated import from //branches/cupcake/...@142643,142643 2009-03-25 15:22:43 -07:00
Dianne Hackborn
15ba27802e Automated import from //branches/master/...@142576,142576 2009-03-25 15:09:04 -07:00
Romain Guy
9c802c1e95 Automated import from //branches/master/...@142575,142575 2009-03-25 15:07:31 -07:00
Raphael Moll
038ab06d64 Automated import from //branches/cupcake/...@142588,142588 2009-03-25 15:06:08 -07:00
Jean-Baptiste Queru
8b0662878e Automated import from //branches/master/...@142574,142574 2009-03-25 15:05:51 -07:00
Karl Rosaen
25e6bb073e Automated import from //branches/cupcake/...@142558,142558 2009-03-25 09:46:56 -07:00
Romain Guy
8c0d68f669 Automated import from //branches/donutburger/...@142490,142490 2009-03-24 22:49:43 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Dianne Hackborn
7d1e577d5f Automated import from //branches/donutburger/...@142472,142472 2009-03-24 22:47:09 -07:00
Romain Guy
870a2b0156 Automated import from //branches/donutburger/...@142470,142470 2009-03-24 22:46:33 -07:00
Romain Guy
97d00b3150 Automated import from //branches/donutburger/...@142465,142465 2009-03-24 22:45:53 -07:00
Eric Fischer
1711c06dd0 Automated import from //branches/master/...@141869,141869 2009-03-24 21:06:32 -07:00
Eric Fischer
897ab77047 Automated import from //branches/donutburger/...@141868,141868 2009-03-24 21:02:49 -07:00
Mathias Agopian
db9540e7b3 Automated import from //branches/master/...@141533,141533 2009-03-24 20:29:58 -07:00
Eric Fischer
45c3ce585f Automated import from //branches/master/...@141530,141530 2009-03-24 20:29:22 -07:00
Mathias Agopian
03f9430323 Automated import from //branches/donutburger/...@141532,141532 2009-03-24 20:29:21 -07:00
Eric Fischer
0412d7f250 Automated import from //branches/donutburger/...@141529,141529 2009-03-24 20:28:56 -07:00
Romain Guy
58cd82b486 Automated import from //branches/master/...@141527,141527 2009-03-24 20:28:52 -07:00
Romain Guy
b2e3a5db68 Automated import from //branches/donutburger/...@141524,141524 2009-03-24 20:28:22 -07:00
Robert Greenwalt
8c785269f8 Automated import from //branches/donutburger/...@141259,141259 2009-03-24 19:55:37 -07:00
Robert Greenwalt
89d4ea4e4b Automated import from //branches/master/...@141261,141261 2009-03-24 19:55:04 -07:00
Dianne Hackborn
ca783b947a Automated import from //branches/cupcake/...@142471,142471 2009-03-24 19:47:09 -07:00
Romain Guy
edbabeb7fa Automated import from //branches/cupcake/...@142469,142469 2009-03-24 19:46:34 -07:00
Mike Cleron
8faf457da6 Automated import from //branches/donutburger/...@141083,141083 2009-03-24 19:28:31 -07:00
Mike Cleron
f559d55e26 Automated import from //branches/master/...@141084,141084 2009-03-24 19:28:11 -07:00
Evan Millar
d0381a16bf Automated import from //branches/master/...@141050,141050 2009-03-24 19:21:48 -07:00
Evan Millar
9c7960dbd4 Automated import from //branches/donutburger/...@141049,141049 2009-03-24 19:21:47 -07:00
Evan Millar
ad5e2e891f Automated import from //branches/master/...@141025,141025 2009-03-24 19:16:17 -07:00
Evan Millar
9dd619f86c Automated import from //branches/donutburger/...@141022,141022 2009-03-24 19:16:16 -07:00
Dianne Hackborn
7713e55991 Automated import from //branches/donutburger/...@141003,141003 2009-03-24 19:12:47 -07:00
Dianne Hackborn
7b67e1e537 Automated import from //branches/master/...@141005,141005 2009-03-24 19:12:39 -07:00