OSDN Git Service
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:02:27 +0000 (17:02 -0800)]
am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
36b48c30adf7236b00eccf87f3b5691359526540':
Rename (IF_)LOG() to (IF_)ALOG()
Jean-Baptiste Queru [Fri, 20 Jan 2012 00:59:41 +0000 (16:59 -0800)]
am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
Justin Ho [Thu, 19 Jan 2012 23:44:53 +0000 (15:44 -0800)]
am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
820b45c0a21980a43532b9fb9823f8aa08c64a15':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Justin Ho [Thu, 19 Jan 2012 23:43:19 +0000 (15:43 -0800)]
Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:41:56 +0000 (14:41 -0800)]
Merge "Rename (IF_)LOG() to (IF_)ALOG()"
Robert Ly [Thu, 19 Jan 2012 21:32:51 +0000 (13:32 -0800)]
am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
4e552533ea049970b54c1cdba5afb7d13496c3c1':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
Robert Ly [Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)]
resolved conflicts for merge of
b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
Robert Ly [Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)]
am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
12310ee801553e63091ce3bda6f07a5be31a473c':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Thu, 19 Jan 2012 00:46:12 +0000 (16:46 -0800)]
am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
230a709285abc5dfd92f05d91a8997d52a59d3c7':
Fix
5863053: Add method to lock screen immediately.
Jim Miller [Thu, 19 Jan 2012 00:44:52 +0000 (16:44 -0800)]
Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
Eric Laurent [Thu, 19 Jan 2012 00:08:06 +0000 (16:08 -0800)]
am
db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit '
db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
Wink Saville [Thu, 19 Jan 2012 00:05:43 +0000 (16:05 -0800)]
am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Eric Laurent [Thu, 19 Jan 2012 00:05:31 +0000 (16:05 -0800)]
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Adam Powell [Wed, 18 Jan 2012 22:49:30 +0000 (14:49 -0800)]
am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:19:52 +0000 (13:19 -0800)]
am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:19:50 +0000 (13:19 -0800)]
am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Joe Fernandez [Wed, 18 Jan 2012 20:35:30 +0000 (12:35 -0800)]
am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Steve Block [Wed, 12 Oct 2011 16:27:03 +0000 (17:27 +0100)]
Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
Scott Main [Sat, 14 Jan 2012 02:25:44 +0000 (18:25 -0800)]
am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:35 +0000 (18:23 -0800)]
am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:23:34 +0000 (18:23 -0800)]
am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:23:33 +0000 (18:23 -0800)]
am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:18:17 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kenny Root [Fri, 13 Jan 2012 21:12:34 +0000 (13:12 -0800)]
am
2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '
2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 20:58:45 +0000 (12:58 -0800)]
am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:35:07 +0000 (12:35 -0800)]
am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 20:08:09 +0000 (12:08 -0800)]
am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:39:03 +0000 (11:39 -0800)]
am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
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
The Android Automerger [Thu, 12 Jan 2012 22:01:29 +0000 (14:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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
OSDN Git Service
