Robert Greenwalt
7f0548c8ee
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:36:18 -07:00
Ramanan Rajeswaran
5eabe8272f
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:16:57 -07:00
Eric Shienbrood
84c73eef74
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:14:07 -07:00
Yu Shan Emily Lau
beef201149
Merge branch 'readonly-p4-donut' into donut
2009-04-13 17:48:53 -07:00
Dan Bornstein
6414b70404
Merge branch 'readonly-p4-donut' into donut
2009-04-13 17:46:03 -07:00
Jeffrey Sharkey
cdda14a60c
Merge branch 'readonly-p4-master'
2009-04-13 16:58:42 -07:00
Dianne Hackborn
7a8e25ab11
Merge branch 'readonly-p4-master'
2009-04-13 16:55:10 -07:00
Dirk Dougherty
c11ebc3cd3
Merge branch 'readonly-p4-master'
2009-04-13 16:52:33 -07:00
Jack Palevich
6cbca50b6a
Clean up trivial Eclipse warnings and fix whitespace.
...
Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.
2009-04-13 16:40:25 -07:00
Dianne Hackborn
75d2f0da2c
Merge branch 'readonly-p4-master'
2009-04-13 16:13:37 -07:00
Dianne Hackborn
2f6d881687
AI 145994: Integrate #145778 from Donut.
...
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Yu Shan Emily Lau
a7fa858d50
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:09:27 -07:00
Dan Bornstein
c5273b8731
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:06:39 -07:00
Brett Chabot
edf53b615c
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:03:16 -07:00
Mathias Agopian
efffa67bf9
Merge commit 'goog/master' into master_gl
2009-04-13 14:31:08 -07:00
Android (Google) Code Review
08be29fb3e
Merge change 65 into donut
...
* changes:
Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Android (Google) Code Review
b3d1c948df
Merge change 64 into donut
...
* changes:
Remove references to android.util.Config
2009-04-13 14:13:00 -07:00
Android (Google) Code Review
81d108cc38
Merge change 63 into donut
...
* changes:
Remove references to android.util.Config
2009-04-13 14:12:27 -07:00
Grace Kloba
6c7aa8d6b8
Merge branch 'readonly-p4-master'
2009-04-13 14:05:40 -07:00
Lorenzo Colitti
df92bfc072
Merge branch 'readonly-p4-donut' into donut
2009-04-13 13:54:13 -07:00
Patrick Scott
bcf27e3ee8
Merge branch 'readonly-p4-master'
2009-04-13 09:59:09 -07:00
Jeffrey Sharkey
7940d198ee
Merge branch 'readonly-p4-donut' into donut
2009-04-13 08:56:31 -07:00
Dianne Hackborn
fb7cab7f63
Merge branch 'readonly-p4-donut' into donut
2009-04-13 08:53:57 -07:00
Dirk Dougherty
b4f65ceb2b
Merge branch 'readonly-p4-donut' into donut
2009-04-13 08:51:20 -07:00
Mathias Agopian
8b765b7f5e
more debugging tools around BufferMapper
2009-04-10 20:34:46 -07:00
Mathias Agopian
2b2fb1a693
fix KeyedVector::replaceValueAt, which wouldn't even compile if used.
2009-04-10 20:27:25 -07:00
Feng Qian
26945b419b
Merge branch 'readonly-p4-master'
2009-04-10 18:12:55 -07:00
Andy Stadler
0be4690849
Merge branch 'readonly-p4-donut' into donut
2009-04-10 16:26:11 -07:00
Andy Stadler
bc0caf802e
AI 145778: Manual merge changes 145382-145384 from cupcake.
...
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Mathias Agopian
0308739d0b
Merge commit 'goog/master' into master_gl
...
Conflicts:
libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
076b1cc3a9
Integrate from //sandbox/mathias/donut/...@145728
...
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Jack Palevich
34a85cc7c0
Merge branch 'readonly-p4-master'
2009-04-09 19:54:37 -07:00
Jack Palevich
eafa04c90d
Merge branch 'readonly-p4-master'
2009-04-09 19:41:44 -07:00
Jack Palevich
1fc1d60798
Merge branch 'readonly-p4-donut' into donut
2009-04-09 18:47:55 -07:00
Jack Palevich
e3b21c013d
Merge branch 'readonly-p4-donut' into donut
2009-04-09 18:04:34 -07:00
Android (Google) Code Review
bb26e32154
Merge change 67 into donut
...
* changes:
Integrate new power connnect/disconnect broadcasts
2009-04-09 16:21:51 -07:00
Fred Quintana
002c054d61
Merge branch 'readonly-p4-master'
2009-04-09 15:07:04 -07:00
Jack Palevich
8386075e62
Merge branch 'readonly-p4-master'
2009-04-09 15:04:22 -07:00
Jack Palevich
6684173667
Merge branch 'readonly-p4-donut' into donut
2009-04-09 15:01:54 -07:00
Jack Palevich
3986a024cf
Merge branch 'readonly-p4-master'
2009-04-09 14:55:24 -07:00
Jack Palevich
4f60b17331
Merge branch 'readonly-p4-donut' into donut
2009-04-09 14:52:42 -07:00
Eric Fischer
0448391039
Merge branch 'readonly-p4-donut' into donut
2009-04-09 14:33:58 -07:00
Eric Fischer
ec2d5b75a2
Merge branch 'readonly-p4-master'
2009-04-09 14:33:10 -07:00
Dianne Hackborn
490b2ba510
AI 145382: API review: change new media keycode names to avoid ambiguity.
...
Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match.
BUG=1779435
Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Nick Pelly
078edfb6ba
Merge branch 'readonly-p4-master'
2009-04-08 19:24:05 -07:00
Romain Guy
82734d92a0
Merge branch 'readonly-p4-master'
2009-04-08 19:21:21 -07:00
Fred Quintana
57fb1cba52
Merge branch 'readonly-p4-master'
2009-04-08 19:16:09 -07:00
Android (Google) Code Review
d83eaa0d31
Merge change 54
...
* changes:
Revert "Enable OpenCORE on master - part 1"
2009-04-08 17:02:55 -07:00
Android (Google) Code Review
f968f2de31
Merge change 53
...
* changes:
Revert "Changes required to accommodate OpenCORE 2.0"
2009-04-08 16:59:58 -07:00
Nick Pelly
4fea662b0f
Merge branch 'readonly-p4-donut' into donut
2009-04-08 15:10:29 -07:00
