Wink Saville
5d98eb7e1b
am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
...
* commit '2f143a966ccfec71de2c3a9785f5f3f47d418acb':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
2012-01-06 14:30:20 -08:00
Wink Saville
8676933648
Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
5fb50802d3
am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
...
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1':
Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
2012-01-06 14:20:41 -08:00
Fabrice Di Meglio
9735559b6d
Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
2012-01-06 14:19:20 -08:00
Justin Ho
67ad74d334
am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
...
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
Fixing crash when taking screenshot over secure window.
2012-01-06 14:10:01 -08:00
Justin Ho
a87c42e2c4
am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
...
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe':
Updating default image wallpaper for tablet.
2012-01-06 14:09:59 -08:00
Justin Ho
52b68583c8
Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
2012-01-06 14:07:51 -08:00
Justin Ho
2e296aeed7
Merge "Updating default image wallpaper for tablet." into ics-mr1
2012-01-06 14:07:37 -08:00
Scott Main
b34baf5f6a
am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
...
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:45:19 -08:00
Scott Main
55ec71116f
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
...
* changes:
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:42:52 -08:00
The Android Open Source Project
ddf6c13a12
Reconcile with ics-mr1-release
...
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
2012-01-05 07:45:28 -08:00
The Android Automerger
31815b4f39
merge in ics-mr1-release history after reset to ics-mr1
2012-01-04 16:42:23 -08:00
Wink Saville
42fdc6f3e3
am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
...
* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
Enhancement on ICS data stall polling logic
2012-01-04 13:55:28 -08:00
Wink Saville
103a6ff9ce
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
2012-01-04 13:53:25 -08:00
Wink Saville
0d69bb8a62
am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
...
* commit 'd4d35168129d544f62cee7e1f83c5bf15d9f291d':
Add support of dislaying Alpha tag for BIP commands
2012-01-04 13:51:59 -08:00
Wink Saville
4ee6427cc5
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
2012-01-04 13:50:04 -08:00
Wink Saville
5bdd1e8ccf
am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
...
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
Support suggestedRetryTime in CDMA DCT
2012-01-04 13:49:37 -08:00
Bart Sears
53cc3c7676
am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
...
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
Do not allow file:// access when it is disabled. Do not merge.
2012-01-04 13:49:34 -08:00
Wink Saville
624eef24dc
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
2012-01-04 13:47:55 -08:00
Bart Sears
66577b602c
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
2012-01-04 13:47:09 -08:00
Eric Laurent
2ae141d964
am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
...
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
2012-01-04 13:00:49 -08:00
Eric Laurent
11cb4c04a3
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
2012-01-04 12:58:17 -08:00
Scott Main
030270348b
am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
...
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
docs: add Teleepoch VID/driver info and update Huawei url
2012-01-04 12:01:02 -08:00
Christopher Tate
48d485e150
am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
...
* commit '30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
2012-01-03 17:40:53 -08:00
Christopher Tate
1e2efa6270
Merge "Tweak docs on 'adb logcat'" into ics-mr1
2012-01-03 17:38:51 -08:00
Scott Main
ec6532faf3
am 12d9954d: docs: dasboard update for 1/3/12
...
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
2012-01-03 15:58:41 -08:00
Dirk Dougherty
c1140c41a5
am a17e100b: Doc change: fix link target for "Publish" icon.
...
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
2012-01-03 10:35:18 -08:00
Scott Main
0b59e0cdb5
am 0582da68: docs: add links for Galaxy Nexus driver
...
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
2011-12-28 10:34:03 -08:00
Joe Fernandez
c79adf24cb
am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
...
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:57:09 -08:00
Joe Fernandez
5c907fd862
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
2011-12-22 15:55:00 -08:00
Roman Nurik
aac4f449cc
am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
...
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
docs: Update App Widgets dev guide size discussion
2011-12-22 14:29:25 -08:00
Roman Nurik
3cae86d9e1
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
2011-12-22 14:27:55 -08:00
The Android Open Source Project
debdcaec3d
Reconcile with ics-mr1-release
...
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
2011-12-21 07:19:20 -08:00
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