The Android Automerger
|
100786e8a5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-20 17:27:07 -08:00 |
|
The Android Open Source Project
|
2e2c59f4c6
|
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
|
2011-12-20 13:08:33 -08:00 |
|
John Wang
|
898459a57b
|
am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c892e177c4f7a41e910c70f68d4e213589da1396':
Hide emergency call text if not support it.
|
2011-12-20 10:43:13 -08:00 |
|
John Wang
|
6e52b21f09
|
Merge "Hide emergency call text if not support it." into ics-mr1
|
2011-12-20 10:41:08 -08:00 |
|
Bill Gruber
|
09058a87d2
|
am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '1d56f41c9d1dcccf1faef343047375cb14799678':
Doc Fix: Sensors and Cameras
|
2011-12-19 17:45:24 -08:00 |
|
Scott Main
|
46268e72de
|
am 8f04ae36: docs: fix sidenav typo
* commit '8f04ae361cd34fdaea41fbedefb85cff2c684e36':
docs: fix sidenav typo
|
2011-12-18 14:03:30 -08:00 |
|
Scott Main
|
2d1553d6bb
|
am df440164: docs: add driver info for Hisense
* commit 'df440164ba09bcce8b409bb5a2d4a4ef8f704148':
docs: add driver info for Hisense
|
2011-12-16 12:56:33 -08:00 |
|
Roman Nurik
|
8f75161dbf
|
am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c':
docs: Add missing intent flag to Android U nav class
|
2011-12-16 12:07:27 -08:00 |
|
Roman Nurik
|
a4c0530828
|
am 00697a90: docs: Add missing intent flag to Android U nav class
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
|
2011-12-16 12:05:32 -08:00 |
|
The Android Automerger
|
ad6e29040c
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-16 12:01:35 -08:00 |
|
Justin Ho
|
65cd774f30
|
am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
|
2011-12-16 11:54:01 -08:00 |
|
Justin Ho
|
fe7a2124ae
|
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
|
2011-12-16 11:52:08 -08:00 |
|
Alexander Lucas
|
678a2adf1a
|
am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit '6469ee8016d1e02673e05356b2590d3175dcd062':
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
|
2011-12-16 11:39:40 -08:00 |
|
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
|
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
|
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
|
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
|
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
|
aca302af4c
|
am 611d03e6: docs: typos
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
docs: typos
|
2011-12-16 10:45:22 -08:00 |
|
The Android Open Source Project
|
7e97651fe3
|
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
|
2011-12-16 08:08:07 -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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
9827c71df4
|
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
|
2011-12-15 19:51:48 -08:00 |
|
Scott Main
|
e872d9213f
|
am ce5643c7: am abfcbd16: docs: typo in training orientation
* commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
docs: typo in training orientation
|
2011-12-15 19:49:50 -08:00 |
|
Scott Main
|
275749e796
|
am abfcbd16: docs: typo in training orientation
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
|
2011-12-15 19:47:47 -08:00 |
|
Roman Nurik
|
fa90d7d9f2
|
am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
docs: Minor bugfix to Android U navigation design class
|
2011-12-15 19:27:25 -08:00 |
|
Roman Nurik
|
21c8f7b615
|
am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
|
2011-12-15 19:25:25 -08:00 |
|
Dave Burke
|
4c63a75d56
|
am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
|
2011-12-15 19:25:07 -08:00 |
|
Dave Burke
|
5e2c246218
|
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
|
2011-12-15 19:23:26 -08:00 |
|
Roman Nurik
|
d2db6cf3a0
|
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
|
2011-12-15 19:23:00 -08:00 |
|