OSDN Git Service
Xia Wang [Thu, 12 Jan 2012 01:53:38 +0000 (17:53 -0800)]
am
4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
* commit '
4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922
Xia Wang [Thu, 12 Jan 2012 01:53:36 +0000 (17:53 -0800)]
am
1446c7b2: Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
* commit '
1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#:
5566079
Xia Wang [Thu, 12 Jan 2012 01:52:06 +0000 (17:52 -0800)]
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:51:48 +0000 (17:51 -0800)]
Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
Katie McCormick [Thu, 12 Jan 2012 00:42:29 +0000 (16:42 -0800)]
am
6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '
6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
Katie McCormick [Thu, 12 Jan 2012 00:40:37 +0000 (16:40 -0800)]
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
John Wang [Wed, 11 Jan 2012 23:36:00 +0000 (15:36 -0800)]
am
6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '
6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
Adjust the mapping of LTE signal bars.
Selim Gurun [Wed, 11 Jan 2012 22:20:32 +0000 (14:20 -0800)]
am
51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '
51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
Do Not Merge. Move ssl callbacks to webcore thread.
Selim Gurun [Wed, 11 Jan 2012 22:18:14 +0000 (14:18 -0800)]
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
Eric Laurent [Wed, 11 Jan 2012 19:12:45 +0000 (11:12 -0800)]
am
c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '
c15cf3d286f3d63d141b73f639a5a61ddb028029':
stagefright: limit audio gap for looped playback
Eric Laurent [Wed, 11 Jan 2012 19:10:38 +0000 (11:10 -0800)]
Merge "stagefright: limit audio gap for looped playback" into ics-mr1
Roman Nurik [Wed, 11 Jan 2012 08:21:41 +0000 (00:21 -0800)]
am
c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit '
c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
Prevent Android Design sidenav links from opening a new window
Scott Main [Wed, 11 Jan 2012 05:13:38 +0000 (21:13 -0800)]
am
acd152f0: docs: editorial fix to homepage
* commit '
acd152f0b7f53c7f09986205b60feb3b6597f700':
docs: editorial fix to homepage
Scott Main [Wed, 11 Jan 2012 01:10:28 +0000 (17:10 -0800)]
am
05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '
05fc9f655aaa01cdb38229d1dc6155a341fa316b':
docs: add links to Android Design from dev docs
Scott Main [Wed, 11 Jan 2012 01:08:19 +0000 (17:08 -0800)]
Merge "docs: add links to Android Design from dev docs" into ics-mr1
Roman Nurik [Wed, 11 Jan 2012 01:04:05 +0000 (17:04 -0800)]
am
548972d7: Merge "Android Design" into ics-mr1
* commit '
548972d798f06c91cb8cba6716952322da97ac21':
Android Design
Roman Nurik [Wed, 11 Jan 2012 01:01:45 +0000 (17:01 -0800)]
Merge "Android Design" into ics-mr1
Scott Main [Tue, 10 Jan 2012 20:55:36 +0000 (12:55 -0800)]
am
d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1
* commit '
d1186cd5bb445e9b0768edf6cb87022865cada55':
docs: fix broken links in .jd docs
Scott Main [Tue, 10 Jan 2012 20:53:42 +0000 (12:53 -0800)]
Merge "docs: fix broken links in .jd docs" into ics-mr1
Jim Miller [Tue, 10 Jan 2012 18:30:41 +0000 (10:30 -0800)]
am
62fad768: Merge "Fix
4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '
62fad7689567bed6ec372401c1b171659c28572d':
Fix
4560303: Add setting to lock later when power button pressed
Jim Miller [Tue, 10 Jan 2012 18:28:21 +0000 (10:28 -0800)]
Merge "Fix
4560303: Add setting to lock later when power button pressed" into ics-mr1
Pin Ting [Tue, 10 Jan 2012 03:00:16 +0000 (19:00 -0800)]
am
497661d3: Merge "Fixes typo." into ics-mr1
* commit '
497661d309ea960aa9723ef4e0d064b56515b566':
Fixes typo.
Pin Ting [Tue, 10 Jan 2012 02:58:13 +0000 (18:58 -0800)]
Merge "Fixes typo." into ics-mr1
Dianne Hackborn [Tue, 10 Jan 2012 00:49:02 +0000 (16:49 -0800)]
am
d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
* commit '
d3be0a76e46584357dbb77fcd200128d0d7dc9a8':
Unhide Resources APIs for getting resources at specific densities.
Dianne Hackborn [Tue, 10 Jan 2012 00:47:35 +0000 (16:47 -0800)]
Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
Elliott Hughes [Tue, 10 Jan 2012 00:12:32 +0000 (16:12 -0800)]
am
64140a07: Fix Music import for Turkish locales.
* commit '
64140a0770f98b56993a96289ec3143e89194265':
Fix Music import for Turkish locales.
The Android Open Source Project [Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
The Android Automerger [Sat, 7 Jan 2012 00:32:11 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eino-Ville Talvala [Fri, 6 Jan 2012 23:49:17 +0000 (15:49 -0800)]
am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
Bart Sears [Fri, 6 Jan 2012 23:47:04 +0000 (15:47 -0800)]
am
a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit '
a476eed6b291d06f5e571597b928b7b2f0b3f257':
getDuration can be only called after prepared. DO NOT MERGE
Eino-Ville Talvala [Fri, 6 Jan 2012 23:46:36 +0000 (15:46 -0800)]
Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
Bart Sears [Fri, 6 Jan 2012 23:45:13 +0000 (15:45 -0800)]
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
Wink Saville [Fri, 6 Jan 2012 22:30:20 +0000 (14:30 -0800)]
am
2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '
2f143a966ccfec71de2c3a9785f5f3f47d418acb':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Wink Saville [Fri, 6 Jan 2012 22:27:56 +0000 (14:27 -0800)]
Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
Fabrice Di Meglio [Fri, 6 Jan 2012 22:20:41 +0000 (14:20 -0800)]
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
Fabrice Di Meglio [Fri, 6 Jan 2012 22:19:20 +0000 (14:19 -0800)]
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
Justin Ho [Fri, 6 Jan 2012 22:10:01 +0000 (14:10 -0800)]
am
beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit '
beb8be60d157e4812e0195c2e445aa0abb82d9a2':
Fixing crash when taking screenshot over secure window.
Justin Ho [Fri, 6 Jan 2012 22:09:59 +0000 (14:09 -0800)]
am
3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '
3116b7a7ca6681daabbdac55e71203995e7a7afe':
Updating default image wallpaper for tablet.
Justin Ho [Fri, 6 Jan 2012 22:07:51 +0000 (14:07 -0800)]
Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
Justin Ho [Fri, 6 Jan 2012 22:07:37 +0000 (14:07 -0800)]
Merge "Updating default image wallpaper for tablet." into ics-mr1
Scott Main [Thu, 5 Jan 2012 17:45:19 +0000 (09:45 -0800)]
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
Scott Main [Thu, 5 Jan 2012 17:42:52 +0000 (09:42 -0800)]
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
The Android Open Source Project [Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:55:28 +0000 (13:55 -0800)]
am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
c697ebfdd671c7f4cf338d601917de16d2f1f135':
Enhancement on ICS data stall polling logic
Wink Saville [Wed, 4 Jan 2012 21:53:25 +0000 (13:53 -0800)]
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:51:59 +0000 (13:51 -0800)]
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
Wink Saville [Wed, 4 Jan 2012 21:50:04 +0000 (13:50 -0800)]
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:49:37 +0000 (13:49 -0800)]
am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
c97d0e43bacdae735071d6d7026175fbc4bdafca':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Wed, 4 Jan 2012 21:49:34 +0000 (13:49 -0800)]
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.
Wink Saville [Wed, 4 Jan 2012 21:47:55 +0000 (13:47 -0800)]
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
Bart Sears [Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)]
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
Eric Laurent [Wed, 4 Jan 2012 21:00:49 +0000 (13:00 -0800)]
am
fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit '
fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Wed, 4 Jan 2012 20:58:17 +0000 (12:58 -0800)]
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
Scott Main [Wed, 4 Jan 2012 20:01:02 +0000 (12:01 -0800)]
am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
docs: add Teleepoch VID/driver info and update Huawei url
Christopher Tate [Wed, 4 Jan 2012 01:40:53 +0000 (17:40 -0800)]
am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Scott Main [Tue, 3 Jan 2012 23:58:41 +0000 (15:58 -0800)]
am
12d9954d: docs: dasboard update for 1/3/12
* commit '
12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
Dirk Dougherty [Tue, 3 Jan 2012 18:35:18 +0000 (10:35 -0800)]
am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
Scott Main [Wed, 28 Dec 2011 18:34:03 +0000 (10:34 -0800)]
am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
Joe Fernandez [Thu, 22 Dec 2011 23:57:09 +0000 (15:57 -0800)]
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
Joe Fernandez [Thu, 22 Dec 2011 23:55:00 +0000 (15:55 -0800)]
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
Roman Nurik [Thu, 22 Dec 2011 22:29:25 +0000 (14:29 -0800)]
am
38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '
38ee0dae2cf0ff1860973523e5cda6e38642e904':
docs: Update App Widgets dev guide size discussion
Roman Nurik [Thu, 22 Dec 2011 22:27:55 +0000 (14:27 -0800)]
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
The Android Open Source Project [Wed, 21 Dec 2011 15:19:20 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
The Android Automerger [Wed, 21 Dec 2011 01:27:07 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
John Wang [Tue, 20 Dec 2011 18:43:13 +0000 (10:43 -0800)]
am
c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit '
c892e177c4f7a41e910c70f68d4e213589da1396':
Hide emergency call text if not support it.
John Wang [Tue, 20 Dec 2011 18:41:08 +0000 (10:41 -0800)]
Merge "Hide emergency call text if not support it." into ics-mr1
Bill Gruber [Tue, 20 Dec 2011 01:45:24 +0000 (17:45 -0800)]
am
1d56f41c: Doc Fix: Sensors and Cameras
* commit '
1d56f41c9d1dcccf1faef343047375cb14799678':
Doc Fix: Sensors and Cameras
Scott Main [Sun, 18 Dec 2011 22:03:30 +0000 (14:03 -0800)]
am
8f04ae36: docs: fix sidenav typo
* commit '
8f04ae361cd34fdaea41fbedefb85cff2c684e36':
docs: fix sidenav typo
Scott Main [Fri, 16 Dec 2011 20:56:33 +0000 (12:56 -0800)]
am
df440164: docs: add driver info for Hisense
* commit '
df440164ba09bcce8b409bb5a2d4a4ef8f704148':
docs: add driver info for Hisense
Roman Nurik [Fri, 16 Dec 2011 20:07:27 +0000 (12:07 -0800)]
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
Roman Nurik [Fri, 16 Dec 2011 20:05:32 +0000 (12:05 -0800)]
am
00697a90: docs: Add missing intent flag to Android U nav class
* commit '
00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
The Android Automerger [Fri, 16 Dec 2011 20:01:35 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 16 Dec 2011 19:54:01 +0000 (11:54 -0800)]
am
043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '
043c5f8f1d9a8e9077e1c16af28509b30f00324d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
Justin Ho [Fri, 16 Dec 2011 19:52:08 +0000 (11:52 -0800)]
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
Alexander Lucas [Fri, 16 Dec 2011 19:39:40 +0000 (11:39 -0800)]
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
Alexander Lucas [Fri, 16 Dec 2011 19:38:05 +0000 (11:38 -0800)]
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
Scott Main [Fri, 16 Dec 2011 19:32:24 +0000 (11:32 -0800)]
am
0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '
0f52d7666e83a7aa1979d65820ece865c7e1fd08':
docs: fix whitespace in sidenav
Scott Main [Fri, 16 Dec 2011 19:30:00 +0000 (11:30 -0800)]
Merge "docs: fix whitespace in sidenav" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 19:25:02 +0000 (11:25 -0800)]
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
Roman Nurik [Fri, 16 Dec 2011 19:23:27 +0000 (11:23 -0800)]
am
eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '
eb946fbdc800d56e1cbac515a1c73de806e74711':
docs: Minor link fix in Android U class
Roman Nurik [Fri, 16 Dec 2011 19:21:59 +0000 (11:21 -0800)]
Merge "docs: Minor link fix in Android U class" into ics-mr0
Bill Gruber [Fri, 16 Dec 2011 19:15:46 +0000 (11:15 -0800)]
am
e2a95b59: am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
e2a95b59f554d1d60b7e6c27d870158ec7051e31':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:13:13 +0000 (11:13 -0800)]
am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
97aafdf46e5007fa7b3f6eae4e54d692877ad824':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:11:46 +0000 (11:11 -0800)]
Merge "Dev guide for sensors" into ics-mr0
Dirk Dougherty [Fri, 16 Dec 2011 18:58:42 +0000 (10:58 -0800)]
am
8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
* commit '
8c65ab81e84f36c311d2ae6831819a5caa404548':
Updated "Designing for Security" documentation
Dirk Dougherty [Fri, 16 Dec 2011 18:56:29 +0000 (10:56 -0800)]
Merge "Updated "Designing for Security" documentation" into ics-mr1
Scott Main [Fri, 16 Dec 2011 18:45:22 +0000 (10:45 -0800)]
The Android Open Source Project [Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
Dirk Dougherty [Fri, 16 Dec 2011 08:25:06 +0000 (00:25 -0800)]
am
8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
* commit '
8b6ed2d17d5e7e47944026679c9cba66611ab27f':
Doc change: edits to ICS MR1 API Overview.
Joe Fernandez [Fri, 16 Dec 2011 07:12:57 +0000 (23:12 -0800)]
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
Joe Fernandez [Fri, 16 Dec 2011 07:11:26 +0000 (23:11 -0800)]
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Fred Chung [Fri, 16 Dec 2011 06:35:10 +0000 (22:35 -0800)]
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.
Fred Chung [Fri, 16 Dec 2011 06:33:31 +0000 (22:33 -0800)]
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.
Scott Main [Fri, 16 Dec 2011 06:14:48 +0000 (22:14 -0800)]
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
Scott Main [Fri, 16 Dec 2011 06:12:53 +0000 (22:12 -0800)]
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Scott Main [Fri, 16 Dec 2011 06:09:46 +0000 (22:09 -0800)]
am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
The Android Automerger [Fri, 16 Dec 2011 04:50:02 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1