Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:56:56 +0000 (16:56 -0700)
committerErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:57:07 +0000 (16:57 -0700)
commitf7f476749a3c28852978314078d2e6a8223e02da
tree75248d6784ec502c0d47d0011de8e1925e8a34cf
parentbd7e766c14bbce76c94905923812753e134f555d
parent30ff24c355ab4cc4f4794f285e1486e90a771d26
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I2fa2ffc7b946ae58b94b75415f64f4f735bd5ee9