Roman Nurik
|
b0bc089750
|
am 4ecb2633: am aaaafca8: docs: Android design CSS/JS fixes
* commit '4ecb2633981d0d58421562ca379a5c79adb413a0':
docs: Android design CSS/JS fixes
|
2012-01-12 14:11:01 -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 |
|
Roman Nurik
|
ba6eb25ba2
|
am 0786bc73: am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '0786bc734e55b40a16d1a475f311c5460ff55d36':
docs: minor Design Principles fixes for Android Design
|
2012-01-12 13:38:01 -08:00 |
|
Jim Miller
|
5bd7c88fc7
|
am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
Fix 5620754: don't show pattern screen after SIM PUK unlock
|
2012-01-12 13:37:58 -08:00 |
|
Daniel Sandler
|
9057f24e0b
|
am 66e66e1d: am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
Clean up wifi/mobile indicators in the expanded panel.
|
2012-01-12 13:37:54 -08:00 |
|
Scott Main
|
2bd98c5ad3
|
am 499b9441: am cf602dbd: docs: replace "decide for me image" bug: 5860467
* commit '499b944133298b4da344fbf97cff25c6f6b9d62f':
docs: replace "decide for me image" bug: 5860467
|
2012-01-12 13:37:41 -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
|
4d7e349bcc
|
am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '1890fa822091ea700b7409ac79a57cf650b55003':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
|
2012-01-12 11:29:39 -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
|
2ec2f4d51d
|
am db4296bd: am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
* commit 'db4296bde95352b6bb5614fad3b08ffaa49dd9c3':
docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
|
2012-01-12 11:26:49 -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
|
8a7c2b1533
|
am b2ff327c: am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
* commit 'b2ff327cb41185030077189bc3e80376acf11c68':
docs: further clarify the behavior of targetSdkVersion bug: 5854083
|
2012-01-12 11:23:11 -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
|
691383f6e9
|
am 6b9a41c5: am baaf136c: am 0a3fcc3e: Fix Apache stack
* commit '6b9a41c55ef9c8ff6f2c7d76f1b81fbe85b2e7d4':
Fix Apache stack
|
2012-01-12 11:07:16 -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 |
|
Michael Jurka
|
5abd6ee84f
|
Merge "Fix NPE in Recent Apps"
|
2012-01-12 10:41:32 -08:00 |
|
Mathias Agopian
|
e8045dc60e
|
Merge "remove dead/usnused code"
|
2012-01-12 10:37:10 -08:00 |
|
Mathias Agopian
|
fcf6cd0421
|
Merge "Fix an issue with VSYNC"
|
2012-01-12 10:36:39 -08:00 |
|
Glenn Kasten
|
7ac21a7609
|
Merge "Use audio_format_t consistently"
|
2012-01-12 10:30:28 -08:00 |
|
Robert Greenwalt
|
8df26f89d8
|
am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
|
2012-01-12 09:29:30 -08:00 |
|
Robert Greenwalt
|
6215e2f133
|
am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
|
2012-01-12 09:26:48 -08:00 |
|
Robert Greenwalt
|
693628ea2c
|
Merge "Ignore case on apn type strings."
|
2012-01-12 09:25:25 -08:00 |
|
Robert Greenwalt
|
f0ece48909
|
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
|
2012-01-12 09:24:45 -08:00 |
|
The Android Open Source Project
|
84b066fddb
|
am ce77af47: Reconcile with ics-mr1-release
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
|
2012-01-12 09:00:21 -08:00 |
|
The Android Open Source Project
|
c6c8d06ea8
|
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
|
2012-01-12 08:56:17 -08:00 |
|
Marco Nelissen
|
98db1598b9
|
Merge "MediaScanner: Disable bulk insert for settings"
|
2012-01-12 07:49:23 -08:00 |
|
Michael Jurka
|
c63c62e0ab
|
Merge "Speeding up System UI pressed anim"
|
2012-01-12 07:35:43 -08:00 |
|
Danielle Millett
|
79ba73dace
|
am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '63faf6c66ff129da9e431dbafd1170a14aedb259':
DO NOT MERGE - Cherry picking from master to MR1
|
2012-01-12 07:33:47 -08:00 |
|
Danielle Millett
|
7c92558beb
|
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
|
2012-01-12 07:31:37 -08:00 |
|
Danielle Millett
|
178c4fbfe2
|
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
|
2012-01-12 07:28:24 -08:00 |
|
Brian Colonna
|
1f3c500feb
|
am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
DO NOT MERGE cherry-picked FU framework tablet commits
|
2012-01-12 06:37:14 -08:00 |
|
Brian Colonna
|
4396642bd5
|
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
|
2012-01-12 06:35:27 -08:00 |
|
Brian Colonna
|
41e7472dad
|
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
|
2012-01-12 06:33:49 -08:00 |
|
Mathias Agopian
|
55ef343331
|
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
|
2012-01-11 22:03:41 -08:00 |
|
Mathias Agopian
|
a72d0db292
|
Fix an issue with VSYNC
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().
Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
|
2012-01-11 22:03:40 -08:00 |
|
satok
|
b37021a362
|
Merge "Make public SpellChecker utilities"
|
2012-01-11 21:14:23 -08:00 |
|
Irfan Sheriff
|
94390d6942
|
Merge "Sync up state with supplicant at start"
|
2012-01-11 20:33:11 -08:00 |
|
Xia Wang
|
1556662f95
|
am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
|
2012-01-11 17:57:16 -08:00 |
|
Xia Wang
|
0b22ec88d3
|
am b18a7c3e: am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit 'b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
Get average value for image processing test bug#: 5566079
|
2012-01-11 17:57:14 -08:00 |
|
Xia Wang
|
61f0dd8594
|
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
|
2012-01-11 17:53:38 -08:00 |
|