Justin Ho
|
3a1fd1a624
|
am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
Quick settings icons updated to match ics style on tablet
|
2011-12-09 15:43:48 -08:00 |
|
Justin Ho
|
1504118362
|
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
|
2011-12-09 15:42:10 -08:00 |
|
Jamie Gennis
|
988637e559
|
SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
|
2011-12-09 15:07:44 -08:00 |
|
Jeff Tinker
|
326de23854
|
am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
|
2011-12-09 11:13:39 -08:00 |
|
Jeff Tinker
|
7052519a97
|
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
|
2011-12-09 11:11:56 -08:00 |
|
Joe Fernandez
|
0de9fa469d
|
am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
|
2011-12-09 10:47:59 -08:00 |
|
Joe Fernandez
|
f0ac62bfe9
|
am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
|
2011-12-09 10:45:44 -08:00 |
|
Joe Fernandez
|
da1d9aa974
|
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
|
2011-12-09 10:43:32 -08:00 |
|
Gilles Debunne
|
3d2918c20f
|
am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
Blinking cursor in Talk
|
2011-12-09 09:36:23 -08:00 |
|
Gilles Debunne
|
09743f40ad
|
Merge "Blinking cursor in Talk" into ics-mr1
|
2011-12-09 09:34:04 -08:00 |
|
The Android Open Source Project
|
395bca9c2f
|
Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
|
2011-12-09 07:11:10 -08:00 |
|
The Android Automerger
|
0c0b586205
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-09 06:58:10 -08:00 |
|
James Dong
|
b7dff74609
|
am aadbd80b: Fixed the false drm recognition.
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
|
2011-12-09 00:17:56 -08:00 |
|
Gilles Debunne
|
8590c22036
|
am be5f49fb: Performance improvements for long text edition.
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
Performance improvements for long text edition.
|
2011-12-08 18:35:22 -08:00 |
|
Gilles Debunne
|
fb33136654
|
am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
* commit 'df3722895172e03c81787f62d922daabaad3e20b':
Fixed SpellCheckerSessions leak in TextView
|
2011-12-08 18:19:57 -08:00 |
|
Gilles Debunne
|
61685f375f
|
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
|
2011-12-08 18:18:25 -08:00 |
|
Gilles Debunne
|
94c12ded11
|
am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
* commit '316ca5059ebd7270a04da5649d25653c355e158d':
Re-use SpanSets in TextLine
|
2011-12-08 18:00:12 -08:00 |
|
Gilles Debunne
|
4ef3648be8
|
Merge "Re-use SpanSets in TextLine" into ics-mr1
|
2011-12-08 17:58:24 -08:00 |
|
Joe Malin
|
9045e2e3c8
|
am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
DOC CHANGE: Package text and Formatter javadoc
|
2011-12-08 17:46:44 -08:00 |
|
Joe Malin
|
2cbbddc0e1
|
am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
|
2011-12-08 17:44:34 -08:00 |
|
Joe Malin
|
4eb44fe66d
|
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
|
2011-12-08 17:42:36 -08:00 |
|
The Android Automerger
|
6f41fea465
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-08 17:35:27 -08:00 |
|
Chia-chi Yeh
|
87f89d1850
|
am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
VPN: delete the "abort" file before starting VPN daemons.
|
2011-12-08 17:24:16 -08:00 |
|
Chia-chi Yeh
|
0c18a10c10
|
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
|
2011-12-08 17:22:16 -08:00 |
|
Irfan Sheriff
|
7e4d6371a7
|
am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
Fix wifi bring up at boot up
|
2011-12-08 16:01:59 -08:00 |
|
Irfan Sheriff
|
e44371c6f1
|
Merge "Fix wifi bring up at boot up" into ics-mr1
|
2011-12-08 15:59:26 -08:00 |
|
Jake Hamby
|
4ca90a0b3c
|
am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
|
2011-12-08 15:53:42 -08:00 |
|
Jake Hamby
|
f73a44533e
|
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
|
2011-12-08 15:51:33 -08:00 |
|
Andreas Huber
|
2bf2a9874d
|
am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
|
2011-12-08 13:35:53 -08:00 |
|
Andreas Huber
|
6eb807707f
|
am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
|
2011-12-08 13:35:51 -08:00 |
|
Andreas Huber
|
dabd58b008
|
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
|
2011-12-08 13:33:16 -08:00 |
|
Andreas Huber
|
405aa649d8
|
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
|
2011-12-08 13:33:06 -08:00 |
|
Svetoslav Ganov
|
baa3fcb45c
|
am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
NumberPicker getting stuck if scroll wheel not wrapable.
|
2011-12-08 12:30:14 -08:00 |
|
Svetoslav Ganov
|
5355d06117
|
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
|
2011-12-08 12:28:11 -08:00 |
|
Irfan Sheriff
|
4a91f6136f
|
am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '583fdf0068ac46fb384a5aa2b193faf743f8221c':
Handle emergency call back mode correctly
|
2011-12-08 12:23:03 -08:00 |
|
Irfan Sheriff
|
807f51e4c2
|
Merge "Handle emergency call back mode correctly" into ics-mr1
|
2011-12-08 12:21:20 -08:00 |
|
Gilles Debunne
|
79443a17a9
|
am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit 'aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
Make the Next key navigate between TextViews
|
2011-12-08 11:58:33 -08:00 |
|
Gilles Debunne
|
0703f733ee
|
am 0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1
* commit '0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
Limit created string size in Spell Checker
|
2011-12-08 11:58:31 -08:00 |
|
Gilles Debunne
|
e8df1fe0fb
|
Merge "Make the Next key navigate between TextViews" into ics-mr1
|
2011-12-08 11:57:06 -08:00 |
|
Gilles Debunne
|
64993fe81c
|
Merge "Limit created string size in Spell Checker" into ics-mr1
|
2011-12-08 11:56:28 -08:00 |
|
Eric Fischer
|
1da214b25a
|
am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'ab6b816a76c77f1ecd9a0ae911026aaba062f6d1':
Import revised translations. DO NOT MERGE
|
2011-12-08 11:11:06 -08:00 |
|
Eric Fischer
|
c88c1187ad
|
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
2011-12-08 11:09:11 -08:00 |
|
The Android Open Source Project
|
65e2784b8a
|
am 641a5624: Reconcile with ics-mr0-release
* commit '641a5624075ee942b85b17646b57f65377567a06':
|
2011-12-08 10:29:04 -08:00 |
|
The Android Open Source Project
|
1b487a6be1
|
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
|
2011-12-08 10:26:33 -08:00 |
|
The Android Open Source Project
|
ddbd1fd2bd
|
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
|
2011-12-08 10:21:43 -08:00 |
|
Gilles Debunne
|
20cbf307bd
|
am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
IOOB is Suggestions
|
2011-12-08 10:01:29 -08:00 |
|
Gilles Debunne
|
ff1defc308
|
am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
Prevent NPE in SuggestionSpan
|
2011-12-08 10:01:27 -08:00 |
|
Gilles Debunne
|
91e3720a47
|
Merge "IOOB is Suggestions" into ics-mr1
|
2011-12-08 09:59:44 -08:00 |
|
Gilles Debunne
|
5a63853ae8
|
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
|
2011-12-08 09:59:29 -08:00 |
|
The Android Automerger
|
b6033fa64c
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-12-08 07:00:35 -08:00 |
|