e4da6a1a79
am cb9ae42: system/core: Remove old mountd code
...
Merge commit 'cb9ae42cd22cca46744bb964a2c412b145225748'
* commit 'cb9ae42cd22cca46744bb964a2c412b145225748':
system/core: Remove old mountd code
2009-04-29 15:17:35 -07:00
9fe0f0d14d
am 6181f70: Merge change 484 into donut
...
Merge commit '6181f70bd40fd020661841923e725df75a3a2793'
* commit '6181f70bd40fd020661841923e725df75a3a2793':
filesystem: Add new group 'sdcard_rw' for restricting sd card write access
2009-04-29 15:17:35 -07:00
cb9ae42cd2
system/core: Remove old mountd code
...
Signed-off-by: San Mehat <san@google.com>
2009-04-27 10:17:34 -07:00
6181f70bd4
Merge change 484 into donut
...
* changes:
filesystem: Add new group 'sdcard_rw' for restricting sd card write access
2009-04-23 11:45:13 -07:00
6e1f21584f
filesystem: Add new group 'sdcard_rw' for restricting sd card write access
...
Signed-off-by: San Mehat <san@google.com>
2009-04-23 09:15:08 -07:00
63d5ac6157
Merge donut into master
2009-04-22 18:33:20 -07:00
ca983f98ba
merge cupcake into donut
2009-04-22 17:57:01 -07:00
f6c95712c4
Merge donut into master
2009-04-22 17:12:44 -07:00
4933098e22
cgroups: Initialize cgroups at startup.
...
Signed-off-by: San Mehat <san@google.com>
2009-04-21 14:34:19 -07:00
41e3a2c5e8
Merge branch 'readonly-p4-master'
2009-04-18 16:17:34 -07:00
f309f77adc
AI 146558: am: CL 146260 Add the net-based routing entries.
...
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
Original author: cywang
Automated import of CL 146558
2009-04-18 16:16:21 -07:00
8b0fb371c1
Merge branch 'readonly-p4-donut' into donut
2009-04-14 18:46:50 -07:00
98c297f244
AI 146260: Add the net-based routing entries.
...
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
Automated import of CL 146260
2009-04-14 18:45:32 -07:00
33d50dc785
Merge branch 'readonly-p4-master'
2009-04-08 19:26:45 -07:00
b33d3415b6
AI 145220: Added "-d" flag to ls.
...
Now you can "ls -l -d <directory>" to see directory perms.
Automated import of CL 145220
2009-04-08 19:25:35 -07:00
477b430700
Improvements to get events: -p, better output.
...
Add new -p option to easily get the output showing which events are reported by the devices.
Improve the reported events output a bit by including a name for each event type.
Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
2009-04-08 15:43:31 -07:00
83eb023a09
Merge branch 'readonly-p4-master'
2009-04-02 11:02:19 -07:00
89efdc9c7f
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
...
Automated import of CL 144245
2009-04-02 11:00:57 -07:00
7bdfb165ad
AI 144185: Integrate cdma into the main code base.
...
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
455a6dffd4
Merge branch 'open_source' into google_internal
2009-03-29 08:55:26 -07:00
0b022b8942
AI 143248: am: CL 142809 am: CL 142808 Don't run hcid through logwrapper.
...
Original author: npelly
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143248
2009-03-27 15:39:15 -07:00
7be77b5ba8
Merge commit 'korg/cupcake'
2009-03-27 15:31:14 -07:00
e49f9c9238
Automated import from //branches/master/...@142981,142981
2009-03-26 14:14:15 -07:00
01161168aa
Automated import from //branches/donutburger/...@142809,142809
2009-03-25 18:00:56 -07:00
8fbedcf73c
Automated import from //branches/cupcake/...@142808,142808
2009-03-25 17:02:32 -07:00
f441e1e9c4
Automated import from //branches/donutburger/...@140818,140818
2009-03-24 18:36:55 -07:00
161b03c7ec
Automated import from //branches/master/...@140824,140824
2009-03-24 18:36:50 -07:00
3207e48071
auto import from //branches/cupcake_rel/...@141571
2009-03-19 23:09:00 -07:00
b1487e4c58
auto import //branches/master/...@140412
2009-03-18 22:20:28 -07:00
f614d64d4b
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:49 -07:00
83b65486be
Merge commit 'remotes/korg/cupcake' into merge
...
Conflicts:
init/devices.c
libpixelflinger/Android.mk
2009-03-18 09:29:29 -07:00
e037fd7e19
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:37 -07:00
2015549667
auto import from //branches/cupcake/...@137873
2009-03-11 12:12:01 -07:00
e4749f30e5
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:15 -07:00
dd7bc3319d
auto import from //depot/cupcake/@135843
2009-03-03 19:32:55 -08:00
e54eebbf1a
auto import from //depot/cupcake/@135843
2009-03-03 18:29:04 -08:00
a1e1c1b106
auto import from //depot/cupcake/@132589
2009-03-03 14:04:41 -08:00
c2d26a164f
auto import from //depot/cupcake/@137055
2009-03-02 22:54:47 -08:00
3e292b9716
auto import from //branches/cupcake/...@132569
2009-02-20 07:38:35 -08:00
261ed7551e
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:36 -08:00
1b8e5a6b14
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:54 -08:00
13f797da7f
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:07 -08:00
4a4c9f6f98
Merge branch 'cupcake'
2009-01-22 00:16:17 -08:00
dcf3ce247e
auto import from //branches/cupcake/...@127436
2009-01-22 00:13:45 -08:00
1b6345894e
Merge branch 'cupcake'
2009-01-20 14:05:44 -08:00
8ac3a13816
auto import from //branches/cupcake/...@127101
2009-01-20 14:04:01 -08:00
439f6ca123
auto import from //branches/cupcake/...@126645
2009-01-15 16:22:10 -08:00
2eef60297a
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:14 -08:00
038862e152
Merge branch 'cupcake'
2009-01-09 18:04:23 -08:00
5ae090ed94
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:25 -08:00
San Mehat