Roman Nurik
1410f8a2a5
am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
...
* commit '795c271f448704561cd1312dd51826dca82f392f':
docs: Minor link fix in Android U class
2011-12-16 11:25:02 -08:00
Roman Nurik
795c271f44
am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
...
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
docs: Minor link fix in Android U class
2011-12-16 11:23:27 -08:00
Roman Nurik
eb946fbdc8
Merge "docs: Minor link fix in Android U class" into ics-mr0
2011-12-16 11:21:59 -08:00
Bill Gruber
c0ae4e47d8
am 4440fbf8: am 590ba7a4: am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
...
* commit '4440fbf840141f4efd6d3fe2f9c63b2cfd378829':
Dev guide for sensors
2011-12-16 11:19:34 -08:00
Bill Gruber
4440fbf840
am 590ba7a4: am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
...
* commit '590ba7a4f03717ebe3171499637e3964c5860c8a':
Dev guide for sensors
2011-12-16 11:17:49 -08:00
Bill Gruber
590ba7a4f0
am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
...
* commit 'e2a95b59f554d1d60b7e6c27d870158ec7051e31':
Dev guide for sensors
2011-12-16 11:15:46 -08:00
Roman Nurik
6b21fa8b72
docs: Minor link fix in Android U class
...
Change-Id: Ifab9c8088ba686a560647883cbacdd34c1c08c80
2011-12-16 11:15:13 -08:00
Bill Gruber
e2a95b59f5
am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
...
* commit '97aafdf46e5007fa7b3f6eae4e54d692877ad824':
Dev guide for sensors
2011-12-16 11:13:13 -08:00
Bill Gruber
97aafdf46e
Merge "Dev guide for sensors" into ics-mr0
2011-12-16 11:11:46 -08:00
Dirk Dougherty
a96a7c6e61
am ff13bf6b: am 41a7998d: am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
...
* commit 'ff13bf6b894c23ac3bb25e32983dcd6bdbc2540f':
Updated "Designing for Security" documentation
2011-12-16 11:04:34 -08:00
Alexander Lucas
9c093132da
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
...
Change-Id: I05c100d583340456eed8d15d555e1f02a38504a8
2011-12-16 11:03:18 -08:00
Scott Main
8d14f2eb6c
am 73f87538: am fa0f39c5: am 611d03e6: docs: typos
...
* commit '73f875380d565471c5b9b1fdeaa9549245bda575':
docs: typos
2011-12-16 11:02:26 -08:00
Dirk Dougherty
ff13bf6b89
am 41a7998d: am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
...
* commit '41a7998df7350e27df6cfdb8683754c83552aab5':
Updated "Designing for Security" documentation
2011-12-16 11:00:49 -08:00
Dirk Dougherty
41a7998df7
am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
...
* commit '8c65ab81e84f36c311d2ae6831819a5caa404548':
Updated "Designing for Security" documentation
2011-12-16 10:58:42 -08:00
Dirk Dougherty
8c65ab81e8
Merge "Updated "Designing for Security" documentation" into ics-mr1
2011-12-16 10:56:29 -08:00
Adrian Ludwig
a15562f8fd
Updated "Designing for Security" documentation
...
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
2011-12-16 10:53:53 -08:00
Scott Main
73f875380d
am fa0f39c5: am 611d03e6: docs: typos
...
* commit 'fa0f39c5454ae9efc00d20326568c0eecb5cc8b4':
docs: typos
2011-12-16 10:47:21 -08:00
Scott Main
fa0f39c545
am 611d03e6: docs: typos
...
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
docs: typos
2011-12-16 10:45:22 -08:00
Alex Sakhartchouk
f92189d2ae
Refactor some common code and make detecting sdcard paths more robust.
...
Change-Id: I6555f6b82e94f8eee0400eddaaffc0442d5e1c41
2011-12-16 10:44:03 -08:00
Scott Main
611d03e693
docs: typos
...
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
2011-12-16 10:41:54 -08:00
Alex Sakhartchouk
8d57f404fa
Merge "Element getters." into graphics-dev
2011-12-16 09:51:53 -08:00
Alex Sakhartchouk
f5d8ac7cc3
Element getters.
...
Change-Id: Ibe570464557eeecad108b4d3cb8f02fad13943de
2011-12-16 09:44:26 -08:00
The Android Open Source Project
00bb647145
am 92363543: am 57ea96a4: Reconcile with ics-mr1-release
...
* commit '923635436b0cd3392f3aa9328a4a855e5000dfb5':
SurfaceMediaSource: use the HW_TEXTURE usage bit
SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-16 08:12:23 -08:00
The Android Open Source Project
923635436b
am 57ea96a4: Reconcile with ics-mr1-release
...
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-16 08:09:57 -08:00
The Android Open Source Project
57ea96a4b3
Reconcile with ics-mr1-release
...
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
2011-12-16 08:08:07 -08:00
Jesse Wilson
a2be5d0a48
am 4868dfa3: Merge "Give a reflection example for installing the HTTP response cache."
...
* commit '4868dfa33b5d710b6f09aad05aa5e256da9cd45d':
Give a reflection example for installing the HTTP response cache.
2011-12-16 07:38:31 -08:00
Jesse Wilson
0adf3e45d8
am 0f05f1eb: Merge "Track libcore tests moving from frameworks/base to libcore."
...
* commit '0f05f1ebefbebdb7b5aec74da553d6a2f3d6e858':
Track libcore tests moving from frameworks/base to libcore.
2011-12-16 07:38:29 -08:00
Jesse Wilson
4868dfa33b
Merge "Give a reflection example for installing the HTTP response cache."
2011-12-16 07:37:22 -08:00
Jesse Wilson
0f05f1ebef
Merge "Track libcore tests moving from frameworks/base to libcore."
2011-12-16 07:36:32 -08:00
Glenn Kasten
4b64d21c09
am f96272c3: Merge "setActiveTrack and setBufferProvider can\'t fail"
...
* commit 'f96272c3cdb3c3f6177d3fcd29e597e10dc2040f':
setActiveTrack and setBufferProvider can't fail
2011-12-16 07:31:36 -08:00
Glenn Kasten
cd5f159420
am 844756be: Merge "Simplify enable/disable mixing"
...
* commit '844756be54681dd96b822558b136367e459e5e6a':
Simplify enable/disable mixing
2011-12-16 07:31:34 -08:00
Glenn Kasten
f96272c3cd
Merge "setActiveTrack and setBufferProvider can't fail"
2011-12-16 07:30:14 -08:00
Glenn Kasten
844756be54
Merge "Simplify enable/disable mixing"
2011-12-16 07:29:57 -08:00
Chet Haase
ada81693a1
am 0904c203: Merge "Fix issues from recent glyph caching change"
...
* commit '0904c203c4c56e43f723522351b7a3bc304196ef':
Fix issues from recent glyph caching change
2011-12-16 06:51:34 -08:00
Chet Haase
0904c203c4
Merge "Fix issues from recent glyph caching change"
2011-12-16 06:49:59 -08:00
Jeff Brown
6754ba24f1
Add plumbing for dumping database info using dumpsys.
...
Change-Id: I51b0364c3d3d41aa38a759fbce48e625fff1b2dd
2011-12-16 04:01:00 -08:00
Jeff Brown
d5064be3b5
Make SQLiteQuery and SQLiteProgram final.
...
We can do this because the classes already cannot be subclassed
by applications due to the fact they only have package private
constructors.
One very nice consequence of this observation is that we can hide or
delete several @deprecated protected members which are effectively
inaccessible because applications cannot create subclasses!
Change-Id: I2d3a0d2ad72b9289ebcdf907e4e4e6caf27f9076
2011-12-16 03:59:26 -08:00
Jeff Brown
99cfc22639
Raise default connection pool size.
...
Bug: 5763266
Change-Id: I8460c942ef882ea747d2b5756c708fce2849de93
2011-12-16 03:59:25 -08:00
Dirk Dougherty
364a4bb80c
am 77aba791: am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
...
* commit '77aba791ac2a9b72632d52d5f6af3bb93334088d':
Doc change: edits to ICS MR1 API Overview.
2011-12-16 00:29:32 -08:00
Dirk Dougherty
77aba791ac
am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
...
* commit '4365a486126ecb20061f01d1e5c8e5f357045f18':
Doc change: edits to ICS MR1 API Overview.
2011-12-16 00:27:42 -08:00
Dirk Dougherty
4365a48612
am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
...
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
Doc change: edits to ICS MR1 API Overview.
2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d
Doc change: edits to ICS MR1 API Overview.
...
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
2011-12-16 00:11:43 -08:00
Joe Fernandez
f866981250
am aa04058c: am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
...
* commit 'aa04058ce05f9ae6f4fa5f7caf1ebf4073f09340':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
2011-12-15 23:17:28 -08:00
Joe Fernandez
aa04058ce0
am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
...
* commit '9b06f091c4d74415b18eb32f84ae931624b93f18':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
2011-12-15 23:15:32 -08:00
Joe Fernandez
9b06f091c4
am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
...
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
...
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
2011-12-15 23:09:43 -08:00
Fred Chung
12316bb355
am 26c4a3e9: am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
* commit '26c4a3e9792755e2ab66331822d6faabc824782e':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:39:56 -08:00
Fred Chung
26c4a3e979
am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
* commit 'd30167f0cda249c9a0d1d118d837d58f3c2b2c89':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:37:40 -08:00
Fred Chung
d30167f0cd
am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:35:10 -08:00