OSDN Git Service
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Robert Ly [Fri, 13 Jan 2012 19:09:27 +0000 (11:09 -0800)]
am
62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '
62472581c30a3202b7bbd86e644b4346d5a4e65c':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
Robert Ly [Fri, 13 Jan 2012 18:13:14 +0000 (10:13 -0800)]
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 15:48:55 +0000 (07:48 -0800)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Scott Main [Thu, 12 Jan 2012 23:47:15 +0000 (15:47 -0800)]
am
722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '
722c8c02f1e17c232b041440ea97a2fda336a6e8':
docs: make AD logo clickable on home page
Scott Main [Thu, 12 Jan 2012 23:44:53 +0000 (15:44 -0800)]
Merge "docs: make AD logo clickable on home page" into ics-mr1
Chia-chi Yeh [Thu, 12 Jan 2012 22:26:43 +0000 (14:26 -0800)]
am
ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '
ff321d496a6a07fc667112ecfe4d9a107d44147b':
VPN: silence VPN notifications.
Chia-chi Yeh [Thu, 12 Jan 2012 22:24:30 +0000 (14:24 -0800)]
Merge "VPN: silence VPN notifications." into ics-mr1
Roman Nurik [Thu, 12 Jan 2012 22:07:51 +0000 (14:07 -0800)]
am
aaaafca8: docs: Android design CSS/JS fixes
* commit '
aaaafca8543eaa75f1865d70c801c9b62caa56e2':
docs: Android design CSS/JS fixes
Roman Nurik [Thu, 12 Jan 2012 20:46:50 +0000 (12:46 -0800)]
am
baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '
baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
docs: minor Design Principles fixes for Android Design
Roman Nurik [Thu, 12 Jan 2012 20:45:00 +0000 (12:45 -0800)]
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Jim Miller [Thu, 12 Jan 2012 20:31:07 +0000 (12:31 -0800)]
am
7a286d83: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
7a286d8391a58637e6834f4de296bf66183ce1b2':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Thu, 12 Jan 2012 20:28:59 +0000 (12:28 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Daniel Sandler [Thu, 12 Jan 2012 19:40:43 +0000 (11:40 -0800)]
am
755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '
755a967bdc2cddb6fbadd10e357f8a5328520061':
Clean up wifi/mobile indicators in the expanded panel.
Daniel Sandler [Thu, 12 Jan 2012 19:38:39 +0000 (11:38 -0800)]
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:35:54 +0000 (11:35 -0800)]
am
cf602dbd: docs: replace "decide for me image" bug:
5860467
* commit '
cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
docs: replace "decide for me image" bug:
5860467
Matthew Xie [Thu, 12 Jan 2012 19:27:10 +0000 (11:27 -0800)]
am
79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '
79d84930cd776c7173330eeb13b3282b6034fc37':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Scott Main [Thu, 12 Jan 2012 19:24:24 +0000 (11:24 -0800)]
am
a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
* commit '
a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519
Matthew Xie [Thu, 12 Jan 2012 19:24:06 +0000 (11:24 -0800)]
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:22:24 +0000 (11:22 -0800)]
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:21:02 +0000 (11:21 -0800)]
am
abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
* commit '
abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
docs: further clarify the behavior of targetSdkVersion bug:
5854083
Scott Main [Thu, 12 Jan 2012 19:19:08 +0000 (11:19 -0800)]
Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
John Reck [Thu, 12 Jan 2012 19:03:06 +0000 (11:03 -0800)]
am
baaf136c: am
0a3fcc3e: Fix Apache stack
* commit '
baaf136cd279e22a7ae4b551ebd5fad23b84996d':
Fix Apache stack
John Reck [Thu, 12 Jan 2012 19:00:17 +0000 (11:00 -0800)]
am
0a3fcc3e: Fix Apache stack
* commit '
0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
Fix Apache stack
Robert Greenwalt [Thu, 12 Jan 2012 17:26:48 +0000 (09:26 -0800)]
am
4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '
4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
Robert Greenwalt [Thu, 12 Jan 2012 17:24:45 +0000 (09:24 -0800)]
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
The Android Open Source Project [Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Danielle Millett [Thu, 12 Jan 2012 15:31:37 +0000 (07:31 -0800)]
am
2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '
2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
Danielle Millett [Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)]
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
Brian Colonna [Thu, 12 Jan 2012 14:35:27 +0000 (06:35 -0800)]
am
8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '
8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
Brian Colonna [Thu, 12 Jan 2012 14:33:49 +0000 (06:33 -0800)]
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
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
The Android Automerger [Thu, 12 Jan 2012 00:29:04 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to 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
OSDN Git Service
