Adam Powell
|
f1bdb7be7d
|
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
|
2012-01-24 13:58:41 -08:00 |
|
Svetoslav Ganov
|
f0e9830e1c
|
Merge "Removing unused imports and swiching off deprecated APIs"
|
2012-01-24 13:57:05 -08:00 |
|
Jeff Sharkey
|
5040231268
|
Merge "Move network stats to FileRotator pattern."
|
2012-01-24 11:49:51 -08:00 |
|
Dianne Hackborn
|
16fc38ea29
|
am a5853595: am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit 'a5853595165a6395ca41bbc17a3dd88e12259ad1':
Another attempt at issue #5823276: home repaints after full-screen app is exited
|
2012-01-24 11:39:49 -08:00 |
|
Dianne Hackborn
|
5d7a07e3fc
|
am 29cd79c7: am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '29cd79c7b0fecd2753fc27405794c0d5b5314302':
Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
|
2012-01-24 11:37:24 -08:00 |
|
Daniel Sandler
|
98a1461a03
|
am 9dc211af: am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
Detect and repair invalid layouts in the navigation bar.
|
2012-01-24 11:37:21 -08:00 |
|
Dianne Hackborn
|
0877ec44ac
|
am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #5823276: home repaints after full-screen app is exited
|
2012-01-24 11:37:02 -08:00 |
|
Dianne Hackborn
|
a4a2df7f69
|
am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit 'c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
|
2012-01-24 11:34:49 -08:00 |
|
Daniel Sandler
|
9fb2e44d12
|
am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
|
2012-01-24 11:34:47 -08:00 |
|
Dianne Hackborn
|
8ee6be57f1
|
Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1
|
2012-01-24 11:33:15 -08:00 |
|
Dianne Hackborn
|
0545e6fcc8
|
Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
|
2012-01-24 11:33:06 -08:00 |
|
Daniel Sandler
|
244d1b2cad
|
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
|
2012-01-24 11:32:31 -08:00 |
|
Dianne Hackborn
|
efa9d3f848
|
Merge "Add new test for showing very slow animations."
|
2012-01-24 11:12:37 -08:00 |
|
Scott Main
|
3bd502442e
|
am e7dc2898: am 4809f09f: docs: update fujitsu id, capitalize
* commit 'e7dc2898c099bb1673f4bb0074b4d3b697699176':
docs: update fujitsu id, capitalize
|
2012-01-24 11:05:02 -08:00 |
|
Scott Main
|
6d0bc6e3dd
|
am b790d1aa: am cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit 'b790d1aa2f741813b1556b71875dc453bc8c8010':
docs: add fujitsu/toshiba USB vendor id
|
2012-01-24 11:02:25 -08:00 |
|
Scott Main
|
67f1d5891e
|
am 4809f09f: docs: update fujitsu id, capitalize
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
docs: update fujitsu id, capitalize
|
2012-01-24 11:01:49 -08:00 |
|
Scott Main
|
dac2f15d6a
|
am cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
docs: add fujitsu/toshiba USB vendor id
|
2012-01-24 10:59:23 -08:00 |
|
Gilles Debunne
|
9435129596
|
Merge "Fix for AOOB in MeasuredText"
|
2012-01-24 10:46:58 -08:00 |
|
Gilles Debunne
|
10f7690894
|
Merge "Restored selectAllOnFocus"
|
2012-01-24 10:42:09 -08:00 |
|
Jean-Baptiste Queru
|
aeeebd252f
|
am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
|
2012-01-24 08:46:26 -08:00 |
|
Jean-Baptiste Queru
|
7c21224b8c
|
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
|
2012-01-24 08:43:14 -08:00 |
|
Jean-Baptiste Queru
|
c8c4c9b2c8
|
am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
|
2012-01-24 08:40:50 -08:00 |
|
Jean-Baptiste Queru
|
e5fb848d1f
|
Merge "stagefright aacenc: Properly terminate a comment"
|
2012-01-24 07:51:12 -08:00 |
|
Adam Cohen
|
363ca779e8
|
Merge "Fix issue 5905210, AdapterViewAnimator sending negative index to Adapter"
|
2012-01-23 19:23:06 -08:00 |
|
Fabrice Di Meglio
|
3e22e6de63
|
Merge "Fix bug # 5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
|
2012-01-23 18:59:17 -08:00 |
|
Chia-chi Yeh
|
10668414c4
|
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
|
2012-01-23 18:40:52 -08:00 |
|
Jeff Brown
|
e67b8f270c
|
Merge "Inform ContentObservers about the changed content Uri."
|
2012-01-23 17:36:06 -08:00 |
|
Jeff Brown
|
5c079f2d27
|
Merge "Clean up content observer code."
|
2012-01-23 17:35:50 -08:00 |
|
Romain Guy
|
ea199dd0dd
|
Merge "Add full support for Canvas.setDrawFilter()"
|
2012-01-23 17:10:42 -08:00 |
|
Romain Guy
|
7f69e142ac
|
Merge "Update hardware acceleration doc"
|
2012-01-23 16:27:50 -08:00 |
|
Jim Miller
|
a967bb6d75
|
am 9f080e2a: am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '9f080e2a5bc6a268934e32201c69ea8a86900396':
Revert "Fix 5797764: Increase lock screen's thread priority"
|
2012-01-23 15:53:17 -08:00 |
|
Jim Miller
|
5f7ea7c272
|
am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '44760b106a4bafcf83fb356bf91683db40e0e5a2':
Revert "Fix 5797764: Increase lock screen's thread priority"
|
2012-01-23 15:51:23 -08:00 |
|
Jim Miller
|
666b06d8f4
|
Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1
|
2012-01-23 15:49:32 -08:00 |
|
Fabrice Di Meglio
|
b77c9a24fd
|
Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"
|
2012-01-23 15:46:58 -08:00 |
|
Romain Guy
|
5a3976e6e1
|
Merge "Fix API typo"
|
2012-01-23 15:35:24 -08:00 |
|
Justin Ho
|
d2ef8db204
|
am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
2012-01-23 15:16:00 -08:00 |
|
Justin Ho
|
7ef6ae3b9b
|
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
2012-01-23 15:13:19 -08:00 |
|
Justin Ho
|
7ebc940ec5
|
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
|
2012-01-23 15:11:00 -08:00 |
|
John Reck
|
e648baa367
|
Merge "Fix crash when scrolling a layer"
|
2012-01-23 15:04:13 -08:00 |
|
Dianne Hackborn
|
302121f711
|
Merge "New screen rotation animation design."
|
2012-01-23 14:34:55 -08:00 |
|
Gilles Debunne
|
c8a43ba266
|
Merge "Double tap to select enabled on suggestions"
|
2012-01-23 14:10:44 -08:00 |
|
Dianne Hackborn
|
22bdf7b4bf
|
Merge "New brightness setting to adjust auto-brightness mode."
|
2012-01-23 12:36:19 -08:00 |
|
Wink Saville
|
8f9983a1c9
|
Merge "Do not clear good TLVs when a error occurs decoding."
|
2012-01-23 12:22:21 -08:00 |
|
Andy McFadden
|
304fc687ee
|
Merge "Don't use bootstrap loader directly"
|
2012-01-23 12:21:19 -08:00 |
|
Bill Gruber
|
012529c952
|
am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit 'add87f99d9ece26c776abe40297e9a49e08932d9':
DevDocs update: Publishing on Market
|
2012-01-23 10:41:43 -08:00 |
|
The Android Open Source Project
|
c68988c6fc
|
am 961b1df3: Reconcile with ics-mr1-release
* commit '961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
Fix 5797764: Increase lock screen's thread priority
|
2012-01-23 10:41:37 -08:00 |
|
Bill Gruber
|
3f92dbe932
|
am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
DevDocs update: Publishing on Market
|
2012-01-23 10:23:10 -08:00 |
|
Bill Gruber
|
9432e6bfea
|
Merge "DevDocs update: Publishing on Market" into ics-mr1
|
2012-01-23 10:21:16 -08:00 |
|
The Android Open Source Project
|
3b79d1b26e
|
Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
|
2012-01-23 10:15:41 -08:00 |
|
Andy McFadden
|
8957bafdcc
|
Merge "Use Map.Entry, not HashMap.Entry"
|
2012-01-23 09:34:17 -08:00 |
|