12040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Hsieh	d39deac4a6	am d613956f: Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" ... * commit 'd613956fdff6250aa9f143b84332c840224608db': Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86	2012-12-04 10:56:40 -08:00
Andrew Hsieh	d613956fdf	Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86"	2012-12-04 10:50:09 -08:00
Andrew Hsieh	c45fca2926	Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86 ... SL_IID_ANDROIDBUFFERQUEUESOURCE is new in android-14 and already declared in platforms/android-14/include/SLES/OpenSLES_Android.h, but it's missing from libOpenSLES.so It turns out both *.functions.txt and *.variables.txt should exist for gen-platforms.sh to generate new *.so. Add *.functions.txt otherwise development/ndk/platforms/android-14/arch-(arm|x86)/symbols/libOpenSLES.so.variables.txt are ignored. Note that MIPS is correct all along. See http://code.google.com/p/android/issues/detail?id=40625 Change-Id: I826f13a93c9f3eaf648a59e7e844b53be5f7fba0	2012-12-04 20:23:41 +08:00
The Android Open Source Project	73ab2652a7	am 98b6d047: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit '98b6d04739521edc2d0ffe02a41eaf074e3e1fa5':	2012-12-03 11:36:39 -08:00
The Android Open Source Project	98b6d04739	Reconcile with jb-mr1.1-release - do not merge ... Change-Id: I1f1dd624a0e8cb1fd8b767acfccd092f6b81230e	2012-12-03 11:34:03 -08:00
The Android Automerger	5ef16dab70	merge in jb-mr1.1-release history after reset to jb-mr1.1-dev	2012-12-03 06:06:29 -08:00
Dirk Dougherty	4167988cdb	am 7bac2b5d: am 81c152c6: am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. ... * commit '7bac2b5dd6c7115f4b7f73fda96b5d66a5471f41': Redirects /guide/google to /google/.	2012-12-02 18:01:55 -08:00
Dirk Dougherty	7bac2b5dd6	am 81c152c6: am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. ... * commit '81c152c6185a49b65067423c95a5ca59fe744808': Redirects /guide/google to /google/.	2012-12-02 17:59:59 -08:00
Dirk Dougherty	81c152c618	am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. ... * commit '51b6b20fe6feeb0152481ccf810e98b691970075': Redirects /guide/google to /google/.	2012-12-02 17:58:47 -08:00
Dirk Dougherty	51b6b20fe6	am 6d198012: Redirects /guide/google to /google/. ... * commit '6d198012a9150521c08af28c669b5b589f0465ac': Redirects /guide/google to /google/.	2012-12-02 17:56:36 -08:00
Dirk Dougherty	6d198012a9	Redirects /guide/google to /google/. ... Change-Id: I5018200bb8717e69d2485ce4d1b8804a1d90e2c8	2012-12-02 17:25:10 -08:00
Romain Guy	58e2715424	Merge "Fix stack tool to find the correct toolchain"	2012-11-30 15:01:49 -08:00
Romain Guy	fdc3519cd7	Fix stack tool to find the correct toolchain ... Change-Id: Ie525b286a4d133512c72b234f03e54f8635c15ee	2012-11-30 14:56:39 -08:00
Igor Murashkin	328bdf979a	EmulatedCamera2: Fix metadata symbols ... Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a	2012-11-30 14:13:09 -08:00
Xavier Ducrohet	39460fa3ec	am dcabeb6e: am ff32ac93: am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 ... * commit 'dcabeb6e777d35e54c92e1c5307aa0904aabf424': Move plat-tools SDK component rev to 16.0.1	2012-11-30 14:03:26 -08:00
Xavier Ducrohet	dcabeb6e77	am ff32ac93: am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 ... * commit 'ff32ac932704748227b11a82e4d2b59734e85f05': Move plat-tools SDK component rev to 16.0.1	2012-11-30 14:01:35 -08:00
Xavier Ducrohet	ff32ac9327	am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 ... * commit '8325f80ba4489b7a66f8c81fef47104e7f1c0625': Move plat-tools SDK component rev to 16.0.1	2012-11-30 13:59:01 -08:00
Xavier Ducrohet	8325f80ba4	am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 ... * commit '0e61ea6f3967846d0796d533f98cad0fb91f3d3d': Move plat-tools SDK component rev to 16.0.1	2012-11-30 13:57:31 -08:00
Xavier Ducrohet	0e61ea6f39	Move plat-tools SDK component rev to 16.0.1 ... Change-Id: Id04fb83c09190bdb1a1b0c685c2c7db3ada8c47d	2012-11-30 13:54:11 -08:00
Andrew Hsieh	8b357a30e0	am 4ed4aeac: am 206315bc: Merge "Bug: __WINT_TYPE__ and wint_t reference to different types" ... * commit '4ed4aeac0a593e464b29bdc9e5499b5e5396e1e9': Bug: __WINT_TYPE__ and wint_t reference to different types	2012-11-29 19:45:26 -08:00
Andrew Hsieh	4ed4aeac0a	am 206315bc: Merge "Bug: __WINT_TYPE__ and wint_t reference to different types" ... * commit '206315bc74558d92e1c619616c1b8d2df75f7e2c': Bug: __WINT_TYPE__ and wint_t reference to different types	2012-11-29 19:43:49 -08:00
Andrew Hsieh	206315bc74	Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"	2012-11-29 19:21:58 -08:00
Andy McFadden	452ed1183c	Merge "Update Eclipse CDT include paths"	2012-11-28 14:33:58 -08:00
Andy McFadden	4db52ad567	Update Eclipse CDT include paths ... include/arch moved add libnativehelper for jni.h Change-Id: I96367214cbdeb2e185fbda2c0cfaecc87a25164a	2012-11-28 14:33:21 -08:00
The Android Open Source Project	40e7da907b	am eb2ae702: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit 'eb2ae702aff506f30346ff4bf1c056453859b5f5':	2012-11-28 09:49:30 -08:00
The Android Open Source Project	eb2ae702af	Reconcile with jb-mr1.1-release - do not merge ... Change-Id: Iddf9a966691f7f0f76d3822617d2c3000ecc704f	2012-11-28 09:47:20 -08:00
kmccormick@google.com	47650f5754	am a65a3669: am 83f7dd40: am 6eed638a: am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit 'a65a366905755a51d000b115760e88a15cb8ff2b': Doc change: sample app for Notifications class	2012-11-27 17:33:37 -08:00
The Android Automerger	4a1648693a	merge in jb-mr1.1-release history after reset to jb-mr1.1-dev	2012-11-27 15:34:15 -08:00
Romain Guy	d5e5851a3c	Merge "Update TextClock sample code"	2012-11-27 14:37:07 -08:00
Romain Guy	47e30d714f	Update TextClock sample code ... The update sample shows how to use custom fonts, color names and color resources. Change-Id: I4b7929dde2611de3aef7a2e4a0853187bf223f43	2012-11-27 12:04:16 -08:00
kmccormick@google.com	a65a366905	am 83f7dd40: am 6eed638a: am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit '83f7dd40051b9a8e2a3786642c45e3166a137889': Doc change: sample app for Notifications class	2012-11-27 11:36:41 -08:00
kmccormick@google.com	83f7dd4005	am 6eed638a: am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit '6eed638a9cbb8410a0f62846eb234a152e875759': Doc change: sample app for Notifications class	2012-11-27 11:31:58 -08:00
kmccormick@google.com	6eed638a9c	am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit 'ab85a2a59a1fd2dad2ad27d5b8853b589d942e2f': Doc change: sample app for Notifications class	2012-11-27 11:27:33 -08:00
kmccormick@google.com	ab85a2a59a	am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit 'd77ac2b955ff5adf68f7437bb286c3e02430f896': Doc change: sample app for Notifications class	2012-11-27 11:25:27 -08:00
kmccormick@google.com	d77ac2b955	am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit '80e0ac6abc4a58d7442cc1d0707e77f4636ea0bd': Doc change: sample app for Notifications class	2012-11-27 11:22:40 -08:00
kmccormick@google.com	80e0ac6abc	am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs ... * commit '70db2b6bcebfd7c34533114b0dab00d2a821d9c5': Doc change: sample app for Notifications class	2012-11-27 11:19:36 -08:00
&& repo sync -j8	70db2b6bce	Merge "Doc change: sample app for Notifications class" into jb-dev-docs	2012-11-27 10:53:04 -08:00
The Android Open Source Project	869a28537c	am ba2c0087: (-s ours) am a6caaa2e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge ... * commit 'ba2c0087fbe17c7f247ada75828185e8eab7325e':	2012-11-27 08:24:58 -08:00
The Android Open Source Project	ba2c0087fb	am a6caaa2e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge ... * commit 'a6caaa2e0a0699f6538a2e922228c027dd78499f':	2012-11-27 08:22:29 -08:00
The Android Open Source Project	a6caaa2e0a	Merge jb-mr1-dev into aosp/master - do not merge ... Change-Id: Ic92c37b93a5a20e1bed9ec523893b6179378ed4c	2012-11-27 08:21:00 -08:00
The Android Open Source Project	f291ad46eb	am 26cb3534: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit '26cb353457293f1812ed9c9fda87477724ad51ee':	2012-11-27 07:44:41 -08:00
The Android Open Source Project	26cb353457	Reconcile with jb-mr1.1-release - do not merge ... Change-Id: Iad0c1acc5bc938d9fb65b64119152daee5a71a1c	2012-11-27 07:43:04 -08:00
&& repo sync -j8	fc0d593056	Doc change: sample app for Notifications class ... Change-Id: Iaa45156f333e5b8e9bc9cc596900835540ff138e	2012-11-26 16:56:34 -08:00
Sergey Melnikov	02327e165a	Bug: __WINT_TYPE__ and wint_t reference to different types ... __WINT_TYPE__ type provided by gcc. It references to unsigned int type for android and linux. Patch corrects wint_t typedef to __WINT_TYPE__. Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com> Change-Id: Ib02a808283f91f17c1124fc9e304911659f4af74	2012-11-26 12:01:00 +04:00
Andrew Hsieh	5c7d48e411	am 370b5b2d: am 15353541: Merge "Correct typo" ... * commit '370b5b2d08ba54e0ac91c6706d9b7820468d0317': Correct typo	2012-11-23 01:54:37 -08:00
Andrew Hsieh	597c307fd3	am 20e953f0: am 19b44fd4: Merge "Check the presence of __STDC_VERSION__ in <sys/cdefs.h>" ... * commit '20e953f029578ee822d8003f564b94afd0a7813f': Check the presence of __STDC_VERSION__ in <sys/cdefs.h>	2012-11-23 01:54:35 -08:00
Andrew Hsieh	370b5b2d08	am 15353541: Merge "Correct typo" ... * commit '1535354143362c6a1e223ba475a6ff9cac2e1db4': Correct typo	2012-11-23 01:52:58 -08:00
Andrew Hsieh	20e953f029	am 19b44fd4: Merge "Check the presence of __STDC_VERSION__ in <sys/cdefs.h>" ... * commit '19b44fd4b7cb4352ccac7910328c035f8f780a5f': Check the presence of __STDC_VERSION__ in <sys/cdefs.h>	2012-11-23 01:52:57 -08:00
Andrew Hsieh	1535354143	Merge "Correct typo"	2012-11-23 01:35:35 -08:00
Andrew Hsieh	19b44fd4b7	Merge "Check the presence of __STDC_VERSION__ in <sys/cdefs.h>"	2012-11-23 01:35:13 -08:00