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
Andrew Hsieh
6162d4e848
Correct typo
...
See http://code.google.com/p/android/issues/detail?id=15134
Change-Id: I3eeed151949086fa132dc258d43bee21eab4af9b
2012-11-23 17:01:06 +08:00
Andrew Hsieh
28464f3b51
Check the presence of __STDC_VERSION__ in <sys/cdefs.h>
...
See http://code.google.com/p/android/issues/detail?id=14627
and bea05255de
2012-11-23 12:53:04 +08:00
Andrew Hsieh
3307379509
am 985a7d73: am 3de1121e: Merge "Refresh header byteswap.h and dirent.h"
...
* commit '985a7d73355b57bce4ed027b20643b337b9f541b':
Refresh header byteswap.h and dirent.h
2012-11-21 08:30:42 -08:00
Andrew Hsieh
985a7d7335
am 3de1121e: Merge "Refresh header byteswap.h and dirent.h"
...
* commit '3de1121e22d78b2ab22f57a392e7204ed073907f':
Refresh header byteswap.h and dirent.h
2012-11-21 08:28:29 -08:00
Andrew Hsieh
3de1121e22
Merge "Refresh header byteswap.h and dirent.h"
2012-11-21 08:14:45 -08:00
Andrew Hsieh
279fe064b1
Refresh header byteswap.h and dirent.h
...
Sync with bionic. No new APIs.
Change-Id: Ie1f71d1c56ce2d0574d8b743f205115d2fbc68b4
2012-11-21 14:17:01 +08:00
Andrew Hsieh
c09c6bfbfc
am ad6edf1d: am 5591a960: Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
...
* commit 'ad6edf1d186a6377b407c142453159840bc0bb26':
Fix limits.h to include page.h which provides PAGE_SIZE
2012-11-20 19:10:50 -08:00
Andrew Hsieh
ad6edf1d18
am 5591a960: Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
...
* commit '5591a960038d742a936e62fd05ab29adc673fc7f':
Fix limits.h to include page.h which provides PAGE_SIZE
2012-11-20 19:08:40 -08:00
Andrew Hsieh
5591a96003
Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
2012-11-20 19:01:09 -08:00
Andrew Hsieh
2eb9332422
Fix limits.h to include page.h which provides PAGE_SIZE
...
See 6331db3fd251ddc350913cc1e8a7941740c25f63 and
http://code.google.com/p/android/issues/detail?id=39983
Change-Id: I85083d754fe9b722efcb8ea73f17d88d505c90d1
2012-11-20 16:14:06 +08:00
The Android Automerger
4f4abab001
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-19 16:12:54 -08:00
Scott Main
6feaf1d0df
am 4a4e1219: am 21e38c7f: am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '4a4e121974ae3b4a71fe8cf19f00cf564def2b03':
docs: update redirects for articles
2012-11-16 11:37:20 -08:00
The Android Automerger
57281e9a0d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-16 11:29:16 -08:00
Scott Main
50a167059e
am d0f76c87: am 29808c07: am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit 'd0f76c870c407ebdbf608dac27a7fb38fdd1c4fd':
docs: add redirects for best practices pages that moved to training
2012-11-16 10:43:14 -08:00
Scott Main
4a4e121974
am 21e38c7f: am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '21e38c7fe11313beca9394b0d60bdc9dd1cfcd0a':
docs: update redirects for articles
2012-11-16 09:55:13 -08:00
Scott Main
21e38c7fe1
am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '892fae16468840d19c48a8829ad3fbc214ca82ff':
docs: update redirects for articles
2012-11-16 09:53:47 -08:00
Scott Main
892fae1646
am f394e166: docs: update redirects for articles
...
* commit 'f394e166a0f96c7851445c2a38a9457b9581ddc4':
docs: update redirects for articles
2012-11-16 09:52:23 -08:00
Marco Nelissen
66e9e710a4
Merge "Add gsm decoder to media codec list"
2012-11-16 09:21:20 -08:00
