Robert Ly
|
75aa7310ea
|
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
|
2012-01-18 13:19:50 -08:00 |
|
Robert Ly
|
103e20348e
|
Merge "docs: adding rs api docs" into ics-mr1
|
2012-01-18 13:18:11 -08:00 |
|
Robert Ly
|
140608dd28
|
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
|
2012-01-18 13:17:51 -08:00 |
|
Joe Fernandez
|
629e3a4885
|
am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
|
2012-01-18 12:35:30 -08:00 |
|
Joe Fernandez
|
617d0b0488
|
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
|
2012-01-18 12:33:45 -08:00 |
|
Steve Block
|
00469f1940
|
Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
|
2012-01-18 11:08:20 +00:00 |
|
Scott Main
|
2b4332646c
|
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
|
2012-01-13 18:25:44 -08:00 |
|
Scott Main
|
37a79cfbec
|
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
|
2012-01-13 18:23:40 -08:00 |
|
Scott Main
|
3d66c69643
|
am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
|
2012-01-13 18:23:35 -08:00 |
|
Dianne Hackborn
|
1f7dba4b26
|
am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
|
2012-01-13 18:23:34 -08:00 |
|
Daniel Sandler
|
f176920175
|
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
|
2012-01-13 18:23:33 -08:00 |
|
Scott Main
|
3d3293b131
|
Merge "docs: mention x86 as a native platform filter" into ics-mr1
|
2012-01-13 18:21:42 -08:00 |
|
Dianne Hackborn
|
55f960feb3
|
Merge "Update notification documentation to follow current guidelines." into ics-mr1
|
2012-01-13 16:36:05 -08:00 |
|
The Android Automerger
|
9eb6f85cb5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-13 16:18:17 -08:00 |
|
Kenny Root
|
575f408150
|
am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
|
2012-01-13 13:12:34 -08:00 |
|
Kenny Root
|
f39fc5a881
|
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
|
2012-01-13 13:11:02 -08:00 |
|
Dianne Hackborn
|
3d9e6137a8
|
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
|
2012-01-13 12:58:45 -08:00 |
|
Dianne Hackborn
|
6393739ea4
|
Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
|
2012-01-13 12:56:40 -08:00 |
|
Bart Sears
|
3339f65a39
|
am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
|
2012-01-13 12:35:07 -08:00 |
|
Bart Sears
|
0667548a8a
|
Merge "Update to latest version of Roboto" into ics-mr1
|
2012-01-13 12:32:43 -08:00 |
|
Christopher Tate
|
125fb9efd9
|
am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
|
2012-01-13 12:08:09 -08:00 |
|
Christopher Tate
|
cab5000317
|
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
|
2012-01-13 11:49:20 -08:00 |
|
John Huang
|
29c2558465
|
am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
|
2012-01-13 11:39:03 -08:00 |
|
John Huang
|
f5114c03de
|
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
|
2012-01-13 11:37:15 -08:00 |
|
Jean-Baptiste Queru
|
0dc09a60af
|
am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
|
2012-01-13 11:25:09 -08:00 |
|
Jean-Baptiste Queru
|
97e7d232f1
|
am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
|
2012-01-13 11:22:08 -08:00 |
|
Robert Ly
|
d0bcc3ce38
|
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
|
2012-01-13 11:09:27 -08:00 |
|
Robert Ly
|
c61fa6848c
|
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
|
2012-01-13 10:13:14 -08:00 |
|
Jean-Baptiste Queru
|
dcee50eeef
|
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
|
2012-01-13 07:48:56 -08:00 |
|
Scott Main
|
7af121d449
|
am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '722c8c02f1e17c232b041440ea97a2fda336a6e8':
docs: make AD logo clickable on home page
|
2012-01-12 15:47:15 -08:00 |
|
Scott Main
|
8e9e63253e
|
Merge "docs: make AD logo clickable on home page" into ics-mr1
|
2012-01-12 15:44:53 -08:00 |
|
Chia-chi Yeh
|
6939c0a7aa
|
am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b':
VPN: silence VPN notifications.
|
2012-01-12 14:26:43 -08:00 |
|
Chia-chi Yeh
|
41e18e335b
|
Merge "VPN: silence VPN notifications." into ics-mr1
|
2012-01-12 14:24:30 -08:00 |
|
Roman Nurik
|
762f28178b
|
am aaaafca8: docs: Android design CSS/JS fixes
* commit 'aaaafca8543eaa75f1865d70c801c9b62caa56e2':
docs: Android design CSS/JS fixes
|
2012-01-12 14:07:51 -08:00 |
|
The Android Automerger
|
50f402c4a8
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-12 14:01:29 -08:00 |
|
Roman Nurik
|
cec1831ed9
|
am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
docs: minor Design Principles fixes for Android Design
|
2012-01-12 12:46:50 -08:00 |
|
Roman Nurik
|
be0ede7010
|
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
|
2012-01-12 12:45:00 -08:00 |
|
Jim Miller
|
807fe69065
|
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
|
2012-01-12 12:31:07 -08:00 |
|
Jim Miller
|
32bfab04c4
|
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
|
2012-01-12 12:28:59 -08:00 |
|
Daniel Sandler
|
0321dbe5bb
|
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.
|
2012-01-12 11:40:43 -08:00 |
|
Daniel Sandler
|
6d810d88f8
|
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
|
2012-01-12 11:38:39 -08:00 |
|
Scott Main
|
c903d52575
|
am cf602dbd: docs: replace "decide for me image" bug: 5860467
* commit 'cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
docs: replace "decide for me image" bug: 5860467
|
2012-01-12 11:35:54 -08:00 |
|
Matthew Xie
|
a4a1636b88
|
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
|
2012-01-12 11:27:10 -08:00 |
|
Scott Main
|
aa8778a93e
|
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
|
2012-01-12 11:24:24 -08:00 |
|
Matthew Xie
|
82ba232b50
|
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
|
2012-01-12 11:24:06 -08:00 |
|
Scott Main
|
dab211a8d5
|
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
|
2012-01-12 11:22:24 -08:00 |
|
Scott Main
|
1c68323cbc
|
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
|
2012-01-12 11:21:02 -08:00 |
|
Scott Main
|
0775fc7f0c
|
Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
|
2012-01-12 11:19:08 -08:00 |
|
John Reck
|
0f10b2a7b4
|
am baaf136c: am 0a3fcc3e: Fix Apache stack
* commit 'baaf136cd279e22a7ae4b551ebd5fad23b84996d':
Fix Apache stack
|
2012-01-12 11:03:06 -08:00 |
|
John Reck
|
7cb12cb7aa
|
am 0a3fcc3e: Fix Apache stack
* commit '0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
Fix Apache stack
|
2012-01-12 11:00:17 -08:00 |
|