Merge commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5'
* commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5':
Ensure -user builds can run the dex preopt pass in the emulator.
Merge commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce' into eclair-plus-aosp
* commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce':
vold: Add support for /dev/block/mmcblk1
Merge commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3' into eclair-plus-aosp
* commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3':
Add NOTICE file and license tag for adb
Merge commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007' into eclair-plus-aosp
* commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007':
Ensure -user builds can run the dex preopt pass in the emulator.
Merge commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e'
* commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e':
Add event parameter for the restore set (device id) data is being restored from
This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.
Merge commit '79aedbee8ff9d9c37ae063fc970632faa3f90227' into eclair-plus-aosp
* commit '79aedbee8ff9d9c37ae063fc970632faa3f90227':
Add support for Acer devices
Merge commit 'b92174db6d93521656893a2c5108950417532c1d' into eclair-plus-aosp
* commit 'b92174db6d93521656893a2c5108950417532c1d':
Add event parameter for the restore set (device id) data is being restored from
Merge commit '02f315068e02aa82bc7846b58c4ae959c4b97a24'
* commit '02f315068e02aa82bc7846b58c4ae959c4b97a24':
Add event log tag for server-prompted reset of backup data
Merge commit '061b6de7b350a03a969a82b273a4d585ffbd086c' into eclair-plus-aosp
* commit '061b6de7b350a03a969a82b273a4d585ffbd086c':
Add event log tag for server-prompted reset of backup data
Merge commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7' into eclair-plus-aosp
* commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7':
add account field to the sync log event
Merge commit '6ae9256322053354c7d2badccc0ce5c24b37c243' into eclair-plus-aosp
* commit '6ae9256322053354c7d2badccc0ce5c24b37c243':
adb: Add USB Vendor IDs for LG and Huawei
Merge commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954' into eclair-plus-aosp
* commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954':
adb: Clean up argument passing for create_service_thread()
Merge commit '08c586a507b6b165be164821beea925e730aca99'
* commit '08c586a507b6b165be164821beea925e730aca99':
Improve error-handling when an expected token is missing.
Merge commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26'
* commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26':
Produce error rather than assert when encountering a nested function.
Merge commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7' into eclair-plus-aosp
* commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7':
Improve error-handling when an expected token is missing.
We had been arbitrarily swallowing the next token, even if it wasn't
the one we were expecting. Now we only swallow it if it _is_ the one
we were expecting.
Merge commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4' into eclair-plus-aosp
* commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4':
init.rc: mount debugfs for debugging
Merge commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0' into eclair-plus-aosp
* commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0':
Produce error rather than assert when encountering a nested function.
Merge commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559'
* commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559':
Add bitfields to header for screen shots. This will allow ddms to distinguish
Merge commit '754795537596f5a4b8be2205c5bdba63282b3403'
* commit '754795537596f5a4b8be2205c5bdba63282b3403':
Set permissions properly for any ALSA device under /dev/snd
Merge commit 'da17dee0332375abfc1da6d74de851f906c0357b'
* commit 'da17dee0332375abfc1da6d74de851f906c0357b':
rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support