Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'
* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
Remove hard-coded number of audio channels in AudioSource
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit 'c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
Merge commit '5907ffa453cf92f2f0de760354e4013df4ea6b69'
* commit '5907ffa453cf92f2f0de760354e4013df4ea6b69':
add new video/audio presence icons in the framework resource dirs, and make them public.
Merge commit 'c43f4784253f49189f20d131508bdb23da113197'
* commit 'c43f4784253f49189f20d131508bdb23da113197':
Use the droidcore goal with dist-for-goals.
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'
* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
Merge commit '987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp
* commit '987e223df73abe6cca47d09fff3a87be0243a085':
Use the droidcore goal with dist-for-goals.
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp
* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Merge commit '56b64c75c3809c55c2053f77802344a9e035343f'
* commit '56b64c75c3809c55c2053f77802344a9e035343f':
This patch enables each omx instance to have a separate message dispatcher, and
Merge commit 'ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp
* commit 'ac8b0d47011293ef713f4996317bbda579354200':
This patch enables each omx instance to have a separate message dispatcher, and
