OSDN Git Service
Robert Ly [Fri, 2 Mar 2012 17:11:54 +0000 (09:11 -0800)]
am
b962b98b: am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
b962b98bef33eba634aec41cf9d84527ce9db3bb':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:09:30 +0000 (09:09 -0800)]
am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
67a15457d184f01fffe162a0983d0b507cb7b358':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
George Mount [Fri, 2 Mar 2012 16:43:43 +0000 (08:43 -0800)]
Merge "Quick fix for Monkey NPE."
Dianne Hackborn [Fri, 2 Mar 2012 16:42:22 +0000 (08:42 -0800)]
am
d4202c9d: am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
d4202c9d138459a60fde708ecda995f3b599d252':
Dianne Hackborn [Fri, 2 Mar 2012 16:39:39 +0000 (08:39 -0800)]
am
5d87d51f: am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
5d87d51fab7e17793413c9095028963117e276b8':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:37:48 +0000 (08:37 -0800)]
am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
921e83039d266b6d288fd5e09160d878eccb9e23':
Dianne Hackborn [Fri, 2 Mar 2012 16:36:05 +0000 (08:36 -0800)]
am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
f65951bf5db7a248651cbfa89886d773f95c3e03':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:22 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:21 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Adam Powell [Fri, 2 Mar 2012 07:57:10 +0000 (23:57 -0800)]
am
d9760a81: am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
d9760a813e99670c5bdb05c95ae3bafb58abf897':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:52:39 +0000 (22:52 -0800)]
am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:49:46 +0000 (22:49 -0800)]
am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
637c50db476d9a6cec13551920f7c163fef02ab8':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:46:26 +0000 (22:46 -0800)]
am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
c7e5a2fe3042014f78667228a92e41d0a19547fd':
Fix dividers for LinearLayout (TabWidget)
Mathias Agopian [Fri, 2 Mar 2012 05:22:35 +0000 (21:22 -0800)]
Merge "add more tracing for buffer allocation"
Mathias Agopian [Fri, 2 Mar 2012 05:22:25 +0000 (21:22 -0800)]
Merge "add more ATRACE"
Mathias Agopian [Thu, 1 Mar 2012 23:44:37 +0000 (15:44 -0800)]
add more ATRACE
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
Craig Mautner [Fri, 2 Mar 2012 03:29:46 +0000 (19:29 -0800)]
Merge "Separate animation steps into start, step and finish phases. Fixes bug
6089126."
Dianne Hackborn [Fri, 2 Mar 2012 03:21:40 +0000 (19:21 -0800)]
Merge "Whoops forgot this change."
Dianne Hackborn [Fri, 2 Mar 2012 03:21:22 +0000 (19:21 -0800)]
Merge "Fix issue where pm would clear preferred apps when updating an app."
Jim Miller [Fri, 2 Mar 2012 03:02:19 +0000 (19:02 -0800)]
Merge "Fix
6028595: Fix reboot loop in AccountUnlock due to null callback"
Fabrice Di Meglio [Fri, 2 Mar 2012 01:44:19 +0000 (17:44 -0800)]
Merge "Improve RTL APIs"
Romain Guy [Fri, 2 Mar 2012 01:35:25 +0000 (17:35 -0800)]
Merge "Remove stray log"
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:15:32 +0000 (17:15 -0800)]
am
8f0c03b7: am
673a66e3: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
8f0c03b7833c719c29198be0e4fecbdfb4013e64':
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:12:55 +0000 (17:12 -0800)]
am
6053b195: am
bb69bde5: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:11:22 +0000 (17:11 -0800)]
am
673a66e3: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
673a66e357f49f939cf8e7f603ff14b8474c9032':
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:10:23 +0000 (17:10 -0800)]
am
bb69bde5: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
bb69bde593bc0ba58c744b19c43619d4eb0866b7':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:43 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:25 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)]
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
Wink Saville [Fri, 2 Mar 2012 01:03:47 +0000 (17:03 -0800)]
Merge "Telephony: Remove SimCard and RuimCard"
Robert Ly [Fri, 2 Mar 2012 00:47:06 +0000 (16:47 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:47:04 +0000 (16:47 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:46:58 +0000 (16:46 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:46:55 +0000 (16:46 -0800)]
am
b4afb9a8: am
8125b0b4: am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
b4afb9a89e1a2131ac273f0452fa89b83090b05a':
docs: fix bug
5878445
The Android Open Source Project [Fri, 2 Mar 2012 00:46:44 +0000 (16:46 -0800)]
Jeff Brown [Fri, 2 Mar 2012 00:43:41 +0000 (16:43 -0800)]
Merge "Shouldn't catch Throwable in AsyncTask."
Irfan Sheriff [Fri, 2 Mar 2012 00:26:52 +0000 (16:26 -0800)]
Merge "Fix WifiManager async API"
Adam Powell [Fri, 2 Mar 2012 00:26:03 +0000 (16:26 -0800)]
Merge "Fix dividers for LinearLayout (TabWidget)"
Fabrice Di Meglio [Fri, 2 Mar 2012 00:23:29 +0000 (16:23 -0800)]
Merge "Make layoutDirection API public"
Brian Carlstrom [Fri, 2 Mar 2012 00:22:13 +0000 (16:22 -0800)]
Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"
Teng-Hui Zhu [Fri, 2 Mar 2012 00:04:18 +0000 (16:04 -0800)]
Merge "Allow webview to delete GL resource in a valid EGL context"
The Android Open Source Project [Thu, 1 Mar 2012 23:51:34 +0000 (15:51 -0800)]
Andreas Huber [Thu, 1 Mar 2012 23:46:19 +0000 (15:46 -0800)]
Merge "Remove hacks that worked around issues in OMX components several releases back."
Android Git Automerger [Thu, 1 Mar 2012 23:35:49 +0000 (15:35 -0800)]
am
55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
55fbbce495723a5b17f1b4684d0f9826c75caa97':
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:47 +0000 (15:35 -0800)]
am
da0c4a3e: am
d12347b2: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
da0c4a3ea653a866d6a8fe00bc52f27d0841874b':
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:43 +0000 (15:35 -0800)]
am
353b61a8: am
0ddfe24a: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
353b61a87d9eb0ee223bdda76c30a1364441d962':
Set the video encoding bit rate for the media recorder stress test.
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:39 +0000 (15:35 -0800)]
am
f73222a3: am
964955e0: am
8a9b14d8: am
5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '
f73222a39e0fa294d9105fd7464943aed6e77cd7':
DRM framwork bug fix: add an API to release resources
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:37 +0000 (15:35 -0800)]
am
f09c0c7f: am
93920d79: am
a66be970: am
11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '
f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
Set width of spinner's dropdown to fit on device
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:33 +0000 (15:35 -0800)]
am
dbc591e2: am
c69d6134: am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
dbc591e27686486c732fca2f94fde645e3487b7a':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:25 +0000 (15:35 -0800)]
am
9de7793b: am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:23 +0000 (15:35 -0800)]
am
715c78b9: am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
Eric Fischer [Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)]
am
4917bc10: am
d31da0a6: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
4917bc104da1725d7ba093713de3802dec1515e5':
Eric Fischer [Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)]
am
b145e363: (-s ours) am
ba62da99: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
b145e363ff4e00048cdc9035300a6db05aa0fbb5':
Mark configuration strings as not translatable.
Jim Miller [Thu, 1 Mar 2012 23:01:53 +0000 (15:01 -0800)]
Merge "Fix
5797764: fix crash on tablets"
Jim Miller [Thu, 1 Mar 2012 22:30:21 +0000 (14:30 -0800)]
Merge "Fix
5797764: don't hold PowerManager lock when changing native brightness"
Steve Block [Thu, 1 Mar 2012 22:21:25 +0000 (14:21 -0800)]
Merge "Prevent a 'TODO' from appearing in the JavaDoc"
Robert Ly [Thu, 1 Mar 2012 22:15:03 +0000 (14:15 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:13:15 +0000 (14:13 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:11:05 +0000 (14:11 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:10:46 +0000 (14:10 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:08:40 +0000 (14:08 -0800)]
Merge "fix bug
5942522" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:48:42 +0000 (12:48 -0800)]
Robert Ly [Thu, 1 Mar 2012 20:47:44 +0000 (12:47 -0800)]
am
8125b0b4: am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
8125b0b4343b7f480196ce73103ca00cdf64f9e5':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:44:36 +0000 (12:44 -0800)]
am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:44:35 +0000 (12:44 -0800)]
am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:42:24 +0000 (12:42 -0800)]
Merge "docs: fix bug
5878445" into ics-mr1
Andreas Huber [Thu, 1 Mar 2012 20:41:10 +0000 (12:41 -0800)]
Merge "Instead of hardcoding OMX component names in our code, support"
Romain Guy [Thu, 1 Mar 2012 20:11:59 +0000 (12:11 -0800)]
Merge "Small tweak to Canvas.drawPath() GL implementation"
Teng-Hui Zhu [Thu, 1 Mar 2012 19:32:59 +0000 (11:32 -0800)]
Merge "Clean up Surface Texture on Java side"
Andreas Huber [Wed, 29 Feb 2012 23:47:17 +0000 (15:47 -0800)]
Instead of hardcoding OMX component names in our code, support
a config file instead.
Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
John Wang [Thu, 1 Mar 2012 18:52:47 +0000 (10:52 -0800)]
Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java"
The Android Open Source Project [Thu, 1 Mar 2012 18:46:52 +0000 (10:46 -0800)]
am
4f306bec: Reconcile with ics-mr1-release
* commit '
4f306becef17ea986522202cc8c90b0e32e2ded1':
The Android Open Source Project [Thu, 1 Mar 2012 18:40:12 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
Wink Saville [Thu, 1 Mar 2012 18:28:56 +0000 (10:28 -0800)]
Merge "If no NITZ information use Country Code to set TimeZone."
Jeff Brown [Thu, 1 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "Improve documentation of SQLite debugging options."
Eric Laurent [Thu, 1 Mar 2012 18:17:21 +0000 (10:17 -0800)]
Merge "renamed audio policy output flag."
The Android Open Source Project [Thu, 1 Mar 2012 18:14:27 +0000 (10:14 -0800)]
am
f8e58c8b: Reconcile with ics-mr1-release
* commit '
f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
The Android Open Source Project [Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
Alex Sakhartchouk [Thu, 1 Mar 2012 17:43:43 +0000 (09:43 -0800)]
Merge "Allocation sampling api prototypes."
Roman Nurik [Thu, 1 Mar 2012 17:26:24 +0000 (09:26 -0800)]
am
62b4e4a8: am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
62b4e4a83ea949537ca4bb1f56074d63a17bf87a':
Roman Nurik [Thu, 1 Mar 2012 17:08:33 +0000 (09:08 -0800)]
am
b96ad49a: am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
b96ad49a3a898b741f7c4d6854e599116546e2ac':
docs: Android Design downloads section, linkable H2s.
Robert Greenwalt [Thu, 1 Mar 2012 16:13:24 +0000 (08:13 -0800)]
Merge "Don't forget to turn off mobile_dun"
Android Git Automerger [Thu, 1 Mar 2012 15:35:22 +0000 (07:35 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
satok [Thu, 1 Mar 2012 08:25:03 +0000 (00:25 -0800)]
Merge "Handle sentence level spell checking hidden APIs"
Wu-cheng Li [Thu, 1 Mar 2012 06:49:10 +0000 (22:49 -0800)]
Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."
Jeff Brown [Thu, 1 Mar 2012 05:29:22 +0000 (21:29 -0800)]
Merge "Externalize more SQLite configuration options."
Mathias Agopian [Thu, 1 Mar 2012 04:43:29 +0000 (20:43 -0800)]
add more tracing for buffer allocation
Change-Id: I8408850d0625985992ef2e2cd0c9f300b1fca293
Irfan Sheriff [Thu, 1 Mar 2012 03:33:06 +0000 (19:33 -0800)]
Merge "Improve Wi-Fi hand-off"
Romain Guy [Thu, 1 Mar 2012 03:16:15 +0000 (19:16 -0800)]
Merge "Full implementation of Canvas.drawPath()"
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:04:11 +0000 (19:04 -0800)]
am
d12347b2: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
d12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:03:40 +0000 (19:03 -0800)]
am
0ddfe24a: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
0ddfe24a19882bb355313b6c5c14dcb0c6608365':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:08 +0000 (19:00 -0800)]
am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
eb4f3256b77fe7fd783297a550a64ea441c41169':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:00 +0000 (19:00 -0800)]
am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
eb4f3256b77fe7fd783297a550a64ea441c41169':
Set the video encoding bit rate for the media recorder stress test.
Fabrice Di Meglio [Thu, 1 Mar 2012 02:45:54 +0000 (18:45 -0800)]
Merge "Fix bug #
3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated"
Gilles Debunne [Thu, 1 Mar 2012 01:32:20 +0000 (17:32 -0800)]
Merge "Invalidate text display list on scroll"
Michael Jurka [Thu, 1 Mar 2012 01:30:05 +0000 (17:30 -0800)]
Merge "Fix alpha when swiping recents on tablets"
Jeff Brown [Thu, 1 Mar 2012 01:06:23 +0000 (17:06 -0800)]
Merge "Don't throw if sqlite3_finalize returns an error."
OSDN Git Service
