Alexander Lucas
|
a02222af29
|
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
|
2011-12-16 11:38:05 -08:00 |
|
Scott Main
|
c55beb73f9
|
am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '5e7bed0b2a16c91d90bd274b4fdfe7c6718f11c2':
docs: fix whitespace in sidenav
|
2011-12-16 11:34:19 -08:00 |
|
Scott Main
|
784d3ca78c
|
am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '0f52d7666e83a7aa1979d65820ece865c7e1fd08':
docs: fix whitespace in sidenav
|
2011-12-16 11:32:24 -08:00 |
|
Scott Main
|
c144f4e74a
|
Merge "docs: fix whitespace in sidenav" into ics-mr1
|
2011-12-16 11:30:00 -08:00 |
|
Roman Nurik
|
02c26c2cf8
|
am 1410f8a2: am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '1410f8a2a58beacc84f9e5444af6032f92ef6845':
docs: Minor link fix in Android U class
|
2011-12-16 11:27:02 -08:00 |
|
Roman Nurik
|
b260344f6c
|
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
|
487f720b2b
|
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
|
ff2cb33d88
|
Merge "docs: Minor link fix in Android U class" into ics-mr0
|
2011-12-16 11:21:59 -08:00 |
|
Bill Gruber
|
5cdb6c0507
|
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
|
f92eadf431
|
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 |
|
Bill Gruber
|
bef088b1c4
|
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
|
44d4547b45
|
Merge "Dev guide for sensors" into ics-mr0
|
2011-12-16 11:11:46 -08:00 |
|
Dirk Dougherty
|
90edd0069c
|
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
|
71eca06117
|
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
|
da79d5097d
|
Merge "Updated "Designing for Security" documentation" into ics-mr1
|
2011-12-16 10:56:29 -08:00 |
|
Scott Main
|
21a263ddb9
|
am fa0f39c5: am 611d03e6: docs: typos
* commit 'fa0f39c5454ae9efc00d20326568c0eecb5cc8b4':
docs: typos
|
2011-12-16 10:47:21 -08:00 |
|
Scott Main
|
aca302af4c
|
am 611d03e6: docs: typos
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
docs: typos
|
2011-12-16 10:45:22 -08:00 |
|
The Android Open Source Project
|
b04316c746
|
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
|
7e97651fe3
|
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
|
2011-12-16 08:08:07 -08:00 |
|
Jesse Wilson
|
b28f824856
|
Merge "Give a reflection example for installing the HTTP response cache."
|
2011-12-16 07:37:22 -08:00 |
|
Jesse Wilson
|
8609d94b69
|
Merge "Track libcore tests moving from frameworks/base to libcore."
|
2011-12-16 07:36:32 -08:00 |
|
Glenn Kasten
|
02e69b2852
|
Merge "setActiveTrack and setBufferProvider can't fail"
|
2011-12-16 07:30:14 -08:00 |
|
Glenn Kasten
|
63a1bee8e4
|
Merge "Simplify enable/disable mixing"
|
2011-12-16 07:29:57 -08:00 |
|
Chet Haase
|
4dacc02478
|
Merge "Fix issues from recent glyph caching change"
|
2011-12-16 06:49:59 -08:00 |
|
Dirk Dougherty
|
b2f463d778
|
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
|
480be20aba
|
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 |
|
Joe Fernandez
|
1e472d8e00
|
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
|
2ee51878fe
|
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
|
155e09d518
|
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 |
|
Fred Chung
|
6cfd10b412
|
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
|
78bd4d50f0
|
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 |
|
Fred Chung
|
3aa6cccff1
|
am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
|
2011-12-15 22:33:31 -08:00 |
|
Scott Main
|
b29519c601
|
am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit 'ed8851a6f2e4d9477aaa20c333d7220901d8faeb':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
|
2011-12-15 22:17:15 -08:00 |
|
Scott Main
|
e10fada930
|
am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
|
2011-12-15 22:14:48 -08:00 |
|
Scott Main
|
7f3a146b9d
|
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
|
2011-12-15 22:12:53 -08:00 |
|
Scott Main
|
f0268e4f13
|
am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment
* commit '4faca92faa13bcf5d6c2e76b226466066e5562a2':
docs: update homepage for 4.0.3 announcment
|
2011-12-15 22:12:08 -08:00 |
|
Scott Main
|
7d6b89e7e1
|
am 36c67785: docs: update homepage for 4.0.3 announcment
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
|
2011-12-15 22:09:46 -08:00 |
|
The Android Automerger
|
73ce026418
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-15 20:50:02 -08:00 |
|
Scott Main
|
7c104522b9
|
am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit 'b193d24145d84a1748cfdcffae56ebfe549ef940':
docs: fix encoding issue or whatever with docs (not showing titles)
|
2011-12-15 20:24:47 -08:00 |
|
Scott Main
|
e3f5721dc7
|
am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
docs: fix encoding issue or whatever with docs (not showing titles)
|
2011-12-15 20:22:39 -08:00 |
|
Scott Main
|
c3df4ee009
|
am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
|
2011-12-15 20:19:55 -08:00 |
|
Scott Main
|
d85005d087
|
am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '34e46115a5cee1b0e186b450ef2598df999c5cbe':
docs: add remembering users class to nav
|
2011-12-15 20:01:28 -08:00 |
|
Scott Main
|
4e7c034df0
|
am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
docs: add remembering users class to nav
|
2011-12-15 19:59:25 -08:00 |
|
Scott Main
|
bde21511dd
|
am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '98e4adf942fe3ade14225875fdb018efe941e99f':
Doc merge from master:Training class on Identifying and Authenticating Users.
|
2011-12-15 19:57:21 -08:00 |
|
Scott Main
|
d8f66098f8
|
am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
|
2011-12-15 19:56:47 -08:00 |
|
Scott Main
|
b6f7ffd6ad
|
Merge "docs: add remembering users class to nav" into ics-mr0
|
2011-12-15 19:55:25 -08:00 |
|
Scott Main
|
63752fc830
|
am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
Doc merge from master:Training class on Identifying and Authenticating Users.
|
2011-12-15 19:55:00 -08:00 |
|
Scott Main
|
75e12152fd
|
am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
|
2011-12-15 19:52:50 -08:00 |
|
Scott Main
|
2f92095ec7
|
am ec09b269: am ce5643c7: am abfcbd16: docs: typo in training orientation
* commit 'ec09b2691ef24e25d28d9946c722d154b6067224':
docs: typo in training orientation
|
2011-12-15 19:52:14 -08:00 |
|
Scott Main
|
9827c71df4
|
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
|
2011-12-15 19:51:48 -08:00 |
|