am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c':
  pixelflinger: back-port AOSP master version.
  x86: Add vold.fstab to mount the SD card
  Assembly coded android_memset16 and android_memset32
  debuggerd: IA version
  debuggerd: Reorganize to facilitate IA commit
  Set the modes for rc.* files in /system/etc
  DBUS is not fully implemented. Disable it for now
  debuggerd: Show function names in tombstone backtraces
Add -o loop= option to mount, and fix error detection in mount and umount

This fixes bug http://b.android.com/18419, which complains about a bogus
error check in the mount command (it also was wrong in the umount command)
and also asks for the mount command to support more than one loopback
device, as mentioned in the FIXME comments in mount.c.  This required some
corresponding changes to umount.c

Change-Id: Ib796c70926395e61557e487bad64984d3295d5f3
Add setScalingMode to ANativeWindow

Also cleanup the header a bit. Give fixed values to enum
because these can never change. And try to make all
comments C (as opposed to C++)

Change-Id: Ie0914ccd81a0231f32e8c21a8ff730985c5c3607
Add -F for classify to ls

Adds a field to the non-long version of ls that tells what type of file
it is (i.e., regular, directory, link, fifo, etc).

This is useful for scripts that don't have direct filesystem access.

Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
Add lock/unlock perform codes

these will be used to implement lock/unlock on
surfacetexture.

Change-Id: I75f8d8dd136433bd5d61610caeb763d836f8b4e7
Merge "Add -o loop= option to mount, and fix error detection in mount and umount"
adb: Add USB vendor ID for Lenovo

Change-Id: I1c2423f567272493067fae04e64fdcb651b0af62
Signed-off-by: Mike Lockwood <lockwood@android.com>
am f75a2ed2: Merge from gingerbread-plus-aosp

* commit 'f75a2ed2138cd8b74597bd57e13d12e1f0b815c2':
  adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
  Add Gigabyte's USB vendor ID to adb.
  Add Funai's USB vendor ID to adb.
am 51ca95dc: am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '51ca95dc08a411b7973b5d0626e43f8ba0753370':
  pixelflinger: back-port AOSP master version.
  x86: Add vold.fstab to mount the SD card
  Assembly coded android_memset16 and android_memset32
  debuggerd: IA version
  debuggerd: Reorganize to facilitate IA commit
  Set the modes for rc.* files in /system/etc
  DBUS is not fully implemented. Disable it for now
  debuggerd: Show function names in tombstone backtraces
Show why umount failed.

Change-Id: Id2b3fbc46b8dfbe2f05637fb35c298915cd5f524
NetlinkEvents: adding support for iptables' quota2 NFLOG messages.

It passes the quota2 name and the device at the time the quota was
reached.
  ALERT_NAME=...
  INTERFACE=...

This needs the new kernel in which xt_quota2 can log.

Change-Id: Icf5045374e1e33bdd1da0d2a2c183e70903a1fea
Merge "Show why umount failed."
Merge "Add -F for classify to ls"
am 008cbcd0: Merge "Add -F for classify to ls"

* commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6':
  Add -F for classify to ls
am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls"

* commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126':
  Add -F for classify to ls
Merge "Create world readable, system writeable /data/resource-cache."
resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit 'd0b93f4317c29d434ce22a2643c165317efc5464':
  Create world readable, system writeable /data/resource-cache.
am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit 'af6e3266fd8d4808a3aa2b37e08dce67493ff396':
  Create world readable, system writeable /data/resource-cache.
am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."

* commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67':
  Create world readable, system writeable /data/resource-cache.