Merge commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c'
* commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c':
Update db_operation log tag information to match updated sampling code.
Merge commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c' into eclair-mr2-plus-aosp
* commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c':
Update db_operation log tag information to match updated sampling code.
Merge commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5' into eclair-mr2-plus-aosp
* commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5':
change /cache/recovery group to cache
Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().
Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
Merge commit '6577c0824332165fc49941f813cfefad4fe10a51'
* commit '6577c0824332165fc49941f813cfefad4fe10a51':
Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit '65b109a246cc7c21da398ccf02083b2abd84f669' into eclair-mr2-plus-aosp
* commit '65b109a246cc7c21da398ccf02083b2abd84f669':
Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-mr2
* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-plus-aosp
* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
Work on issue #2259506: camera ANRed and then device runtime restarted
* changes:
Encrypted File SYstems project. Enabling EFS security properties. This change enables persist.security.* flags in the device, allowing oly the system to modify them. Change is necessary to allow for further progress in the project, as this is an ideal location for access both from the framework as well as from the recovery mode / transition.
This change enables persist.security.* flags in the device, allowing oly the system to modify them.
Change is necessary to allow for further progress in the project, as this is an ideal location for access both from the
framework as well as from the recovery mode / transition.
Merge commit '556c60f4f27e2a3bfde6a47acf876716ea8d5795'
* commit '556c60f4f27e2a3bfde6a47acf876716ea8d5795':
Correctly compute the type of an assignment expression.
Merge commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5' into eclair-mr2-plus-aosp
* commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5':
Correctly compute the type of an assignment expression.
Merge commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86' into eclair-mr2
* commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86':
Correctly compute the type of an assignment expression.
Merge commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86' into eclair-plus-aosp
* commit '02effee6a9224b531cb3fe6eac8278b46b9fbe86':
Correctly compute the type of an assignment expression.
Merge commit 'ef063fe3066153dab5389b6baba6cb4e36888106'
* commit 'ef063fe3066153dab5389b6baba6cb4e36888106':
Add support for Acer devices
FreeBSD support for usb-connected devices in adb
Make get_my_path() safer
Fix use of memset function
This change enables following types of statements to work correctly:
a = b = 3;
if ((a = getchar()) < 0) { ... }
This fixes 2232082 acc: assignment in comparison segfaults
Merge commit '9fdf607c20f9610e442baa87cac5479c98f9d200'
* commit '9fdf607c20f9610e442baa87cac5479c98f9d200':
cutils: make set_process_name set kernel thread name as well
Merge commit 'b63747d4d9d2e26c90a5310c996210e722159d04' into eclair-mr2-plus-aosp
* commit 'b63747d4d9d2e26c90a5310c996210e722159d04':
cutils: make set_process_name set kernel thread name as well
Merge commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa' into eclair-mr2
* commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa':
cutils: make set_process_name set kernel thread name as well
Merge commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa' into eclair-plus-aosp
* commit 'f6eba8fac812c70087af225f207f2d924f6e1ffa':
cutils: make set_process_name set kernel thread name as well
Merge commit '879f398a44f8cbb73dec71d8c21931f8a5c46073'
* commit '879f398a44f8cbb73dec71d8c21931f8a5c46073':
Make the RIL daemon part of the audio group so it can load region-specific
Merge commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828' into eclair-mr2-plus-aosp
* commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828':
Make the RIL daemon part of the audio group so it can load region-specific
Merge commit '5e7db233004a0869125d0f2d64a9e747faf252da' into eclair-plus-aosp
* commit '5e7db233004a0869125d0f2d64a9e747faf252da':
Make the RIL daemon part of the audio group so it can load region-specific
Merge commit '5e7db233004a0869125d0f2d64a9e747faf252da' into eclair-mr2
* commit '5e7db233004a0869125d0f2d64a9e747faf252da':
Make the RIL daemon part of the audio group so it can load region-specific