OSDN Git Service
James Dong [Thu, 20 Jan 2011 17:28:55 +0000 (09:28 -0800)]
am
637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
* commit '
637739d4bf014e82af19ec4465e6031579ca6eea':
Eliminate recording sound by starting the video track before audio track.
James Dong [Thu, 20 Jan 2011 17:27:01 +0000 (09:27 -0800)]
Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
Iain Merrick [Thu, 20 Jan 2011 16:19:37 +0000 (08:19 -0800)]
am
8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb
* commit '
8192b4179fd96629383c15f19f38edb22b674e99':
Add BrowserFrame.setCertificate() method.
Iain Merrick [Thu, 20 Jan 2011 16:17:15 +0000 (08:17 -0800)]
Merge "Add BrowserFrame.setCertificate() method." into honeycomb
Ken Wakasa [Thu, 20 Jan 2011 16:14:19 +0000 (08:14 -0800)]
am
586f0513: Refine InputMethodInfo API
* commit '
586f051375d8d7aeece05329921f9f66fc6164cb':
Refine InputMethodInfo API
Tadashi G. Takaoka [Thu, 20 Jan 2011 15:37:14 +0000 (07:37 -0800)]
am
317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
* commit '
317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5':
Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
Tadashi G. Takaoka [Thu, 20 Jan 2011 15:30:36 +0000 (07:30 -0800)]
Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
Kristian Monsen [Thu, 20 Jan 2011 14:37:24 +0000 (06:37 -0800)]
am
7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb
* commit '
7450a32bab8945738589d7b323953cdc80de111f':
Clear the files we copy over to the temp cache
Daniel Sandler [Thu, 20 Jan 2011 14:35:19 +0000 (06:35 -0800)]
am
4e10c2b9: Merge "Simplify and smooth notification panel animation." into honeycomb
* commit '
4e10c2b9d731cc8a8bfb63bf954624cece2c85ae':
Simplify and smooth notification panel animation.
Kristian Monsen [Thu, 20 Jan 2011 14:33:55 +0000 (06:33 -0800)]
Merge "Clear the files we copy over to the temp cache" into honeycomb
Daniel Sandler [Thu, 20 Jan 2011 14:33:44 +0000 (06:33 -0800)]
Merge "Simplify and smooth notification panel animation." into honeycomb
Tadashi G. Takaoka [Thu, 20 Jan 2011 13:19:35 +0000 (05:19 -0800)]
am
90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
* commit '
90fcb2ad9378ee89f6795942c2b065a32bc83895':
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
Tadashi G. Takaoka [Thu, 20 Jan 2011 13:17:51 +0000 (05:17 -0800)]
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
Chia-chi Yeh [Thu, 20 Jan 2011 12:30:13 +0000 (04:30 -0800)]
am
7ccaba69: Merge "Update the path of the intent to unlock keystore." into honeycomb
* commit '
7ccaba693bd328968baf3f117b286659ce4a2a75':
Update the path of the intent to unlock keystore.
Chia-chi Yeh [Thu, 20 Jan 2011 12:29:11 +0000 (04:29 -0800)]
Merge "Update the path of the intent to unlock keystore." into honeycomb
Ben Murdoch [Thu, 20 Jan 2011 11:46:33 +0000 (03:46 -0800)]
am
7e73ce90: DRT needs to clear cookies between tests.
* commit '
7e73ce90d6fc6125a0e2f1bb65495efa1816bb1b':
DRT needs to clear cookies between tests.
Ben Murdoch [Thu, 20 Jan 2011 11:43:30 +0000 (03:43 -0800)]
am
0b5bd35f: Add case-sensitive tests to DRT ignore list.
* commit '
0b5bd35f60507e6899419d4fa3cecc89e2cee9f9':
Add case-sensitive tests to DRT ignore list.
Adam Cohen [Thu, 20 Jan 2011 08:10:59 +0000 (00:10 -0800)]
am
0e2de6d7: Addressing API Review docs bugs:
* commit '
0e2de6d7187ef67ec00a2f2544450caa4a239c39':
Addressing API Review docs bugs:
Scott Main [Thu, 20 Jan 2011 07:02:00 +0000 (23:02 -0800)]
am
e65b0f8d: Merge "Doc change: adding missing nfc demo png" into honeycomb
* commit '
e65b0f8df03c16765b5ece94e5c9c6d75042cae0':
Doc change: adding missing nfc demo png
Scott Main [Thu, 20 Jan 2011 06:58:08 +0000 (22:58 -0800)]
Merge "Doc change: adding missing nfc demo png" into honeycomb
Hung-ying Tyan [Thu, 20 Jan 2011 06:43:13 +0000 (22:43 -0800)]
am
71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '
71196f0cb3406cc4b0b82643ca08b59a97bc4cc8':
Make VpnService synchronous API.
Hung-ying Tyan [Thu, 20 Jan 2011 06:41:20 +0000 (22:41 -0800)]
Merge "Make VpnService synchronous API." into honeycomb
Scott Main [Thu, 20 Jan 2011 06:39:16 +0000 (22:39 -0800)]
am
242d556c: Merge "Doc change: adding missing samples" into honeycomb
* commit '
242d556c983a370ee4fec53154d1ef8b04276eb7':
Doc change: adding missing samples
Scott Main [Thu, 20 Jan 2011 06:37:21 +0000 (22:37 -0800)]
Merge "Doc change: adding missing samples" into honeycomb
Robert Ly [Thu, 20 Jan 2011 06:12:05 +0000 (22:12 -0800)]
am
4c433225: Merge "Doc change: animation devguide topic" into honeycomb
* commit '
4c4332250d9e6d2cb746625cc232052561c4d450':
Doc change: animation devguide topic
Robert Ly [Thu, 20 Jan 2011 06:09:47 +0000 (22:09 -0800)]
Merge "Doc change: animation devguide topic" into honeycomb
Daniel Sandler [Thu, 20 Jan 2011 05:59:45 +0000 (21:59 -0800)]
am
ada2592b: Merge "Text & layout tweaks in system bar:" into honeycomb
* commit '
ada2592b21a55fcb3204fc26ba57d8d56841341b':
Text & layout tweaks in system bar:
Daniel Sandler [Thu, 20 Jan 2011 05:59:41 +0000 (21:59 -0800)]
am
93aae779: Merge "More fixes to ensure that touches outside the panel close it." into honeycomb
* commit '
93aae779bec97fcf383cf80c54f348a8b8c4fd80':
More fixes to ensure that touches outside the panel close it.
Daniel Sandler [Thu, 20 Jan 2011 05:57:35 +0000 (21:57 -0800)]
Merge "Text & layout tweaks in system bar:" into honeycomb
Daniel Sandler [Thu, 20 Jan 2011 05:57:26 +0000 (21:57 -0800)]
Merge "More fixes to ensure that touches outside the panel close it." into honeycomb
Romain Guy [Thu, 20 Jan 2011 05:54:34 +0000 (21:54 -0800)]
am
ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
* commit '
ed8f8dd8cf621d6046db7e083f8a36205ed55609':
Add rounded rects and circles support to OpenGLRenderer.
Adam Powell [Thu, 20 Jan 2011 05:54:30 +0000 (21:54 -0800)]
am
818a7bbf: Merge "Better fix for bug
3112733" into honeycomb
* commit '
818a7bbfb42061d67aae0d5c725cecd0261c9643':
Better fix for bug
3112733
Romain Guy [Thu, 20 Jan 2011 05:52:49 +0000 (21:52 -0800)]
Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
Adam Powell [Thu, 20 Jan 2011 05:52:33 +0000 (21:52 -0800)]
Merge "Better fix for bug
3112733" into honeycomb
Patrick Dubroy [Thu, 20 Jan 2011 05:45:06 +0000 (21:45 -0800)]
am
a6abd062: previewImage API shouldn\'t be hidden.
* commit '
a6abd062bf437fc69131a2797d6974953dd6cd83':
previewImage API shouldn't be hidden.
Hung-ying Tyan [Wed, 19 Jan 2011 08:48:38 +0000 (16:48 +0800)]
Make VpnService synchronous API.
This eases VpnSettings on dealing with multiple-activity-instance problem
(i.e., SettingsActivity and VpnSettingsActivity).
+ Most of the code is moved from the VpnServices package to vpn/java/.
+ VpnManager and VpnServiceBinder are revised to provide synchronous API.
+ Add a new method isIdle() to IVpnService.aidl.
Related bug:
3293236 (need to deal with multiple-activity-instance problem)
Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
Jim Miller [Thu, 20 Jan 2011 04:18:40 +0000 (20:18 -0800)]
am
e25c4d10: Merge "Fix
3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb
* commit '
e25c4d1077071e33795ec0316b504f6cd2a0ba08':
Fix
3339257: Update lockscreen keyboard to fit Holo theme
Jim Miller [Thu, 20 Jan 2011 04:15:49 +0000 (20:15 -0800)]
Merge "Fix
3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb
Jeff Brown [Thu, 20 Jan 2011 02:55:51 +0000 (18:55 -0800)]
am
8b9df978: Merge "Fix getSwitchState." into honeycomb
* commit '
8b9df97826f94e2e871eff734b174a4752b0d5f9':
Fix getSwitchState.
Jeff Brown [Thu, 20 Jan 2011 02:54:11 +0000 (18:54 -0800)]
Merge "Fix getSwitchState." into honeycomb
Jeff Brown [Thu, 20 Jan 2011 02:41:38 +0000 (18:41 -0800)]
Fix getSwitchState.
InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN
because SwitchInputMapper::getSources() returns 0 which cannot
match any source mask including AINPUT_SOURCE_ANY. As a result
initial lid switch detection is broken.
This change adds a new source constant AINPUT_SOURCE_SWITCH
that indicates that the source has switches.
Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
Alexander Lucas [Thu, 20 Jan 2011 02:37:06 +0000 (18:37 -0800)]
am
af3227ff: Merge "Added Honeycomb-Gallery to docs." into honeycomb
* commit '
af3227ff772e8d5d577fd6fa10338837b435e99f':
Added Honeycomb-Gallery to docs.
Alexander Lucas [Thu, 20 Jan 2011 02:33:43 +0000 (18:33 -0800)]
Merge "Added Honeycomb-Gallery to docs." into honeycomb
Mathias Agopian [Thu, 20 Jan 2011 02:26:15 +0000 (18:26 -0800)]
am
baf9af94: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into honeycomb
* commit '
baf9af94a679f7e4b2273bce6c8f4645ef68015a':
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
Mathias Agopian [Thu, 20 Jan 2011 02:25:35 +0000 (18:25 -0800)]
am
54714b8b: Merge "fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into honeycomb
* commit '
54714b8b956be92e8f4c5884fd104867872b9001':
fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
Mathias Agopian [Thu, 20 Jan 2011 02:22:45 +0000 (18:22 -0800)]
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into honeycomb
Mathias Agopian [Thu, 20 Jan 2011 02:22:35 +0000 (18:22 -0800)]
Merge "fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into honeycomb
Mathias Agopian [Mon, 17 Jan 2011 01:57:20 +0000 (17:57 -0800)]
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
EGLUtils::selectConfigForPixelFormat() now uses EGL_NATIVE_VISUAL_ID
to select a config with the proper format. this is more robust and
future proof.
Change-Id: I7245d904adab1e339f062b9b498ddd9324cfe7a4
Huahui Wu [Thu, 20 Jan 2011 02:18:25 +0000 (18:18 -0800)]
am
961d2c6a: Merge "b/
3350774 avoid screen jumping when pinching to zoom." into honeycomb
* commit '
961d2c6acf9a4a61648f040aaaf1e40a83674d59':
b/
3350774 avoid screen jumping when pinching to zoom.
Huahui Wu [Thu, 20 Jan 2011 02:16:24 +0000 (18:16 -0800)]
Merge "b/
3350774 avoid screen jumping when pinching to zoom." into honeycomb
Justin Ho [Thu, 20 Jan 2011 02:09:08 +0000 (18:09 -0800)]
am
3847667d: Updated ic_sysbar icons
* commit '
3847667d530a47fddae752b191a561101253803b':
Updated ic_sysbar icons
Irfan Sheriff [Thu, 20 Jan 2011 02:00:43 +0000 (18:00 -0800)]
am
d033e9ca: Merge "Handle EAP authentication failure" into honeycomb
* commit '
d033e9caa1ad56bc6c4cc23c2104fc8370773e08':
Handle EAP authentication failure
Jeff Brown [Thu, 20 Jan 2011 01:58:32 +0000 (17:58 -0800)]
am
d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
* commit '
d49f3e0078a79804e8dbd455c92786977a686020':
Rename KeyCharacterMap.UnavailableException.
Irfan Sheriff [Thu, 20 Jan 2011 01:58:19 +0000 (17:58 -0800)]
Merge "Handle EAP authentication failure" into honeycomb
Jeff Brown [Thu, 20 Jan 2011 01:56:32 +0000 (17:56 -0800)]
Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
Jason Sams [Thu, 20 Jan 2011 01:53:14 +0000 (17:53 -0800)]
am
a82bcf6a: Merge "Remove some old logging code." into honeycomb
* commit '
a82bcf6a55d89017207ac2e47c21166652dca11f':
Remove some old logging code.
Jason Sams [Thu, 20 Jan 2011 01:50:15 +0000 (17:50 -0800)]
Merge "Remove some old logging code." into honeycomb
Christopher Tate [Thu, 20 Jan 2011 01:31:34 +0000 (17:31 -0800)]
am
5ea769dc: Merge "Make the drag input window fullscreen touchable again" into honeycomb
* commit '
5ea769dcc16be14cb08b4b0093c9c326ba3c1cf6':
Make the drag input window fullscreen touchable again
Christopher Tate [Thu, 20 Jan 2011 01:29:14 +0000 (17:29 -0800)]
Merge "Make the drag input window fullscreen touchable again" into honeycomb
Stephen Hines [Thu, 20 Jan 2011 01:27:20 +0000 (17:27 -0800)]
am
eb60932a: Merge "Clean up RS math fp library functions." into honeycomb
* commit '
eb60932a199b5702c36bee760e2f69565a4f3f2e':
Clean up RS math fp library functions.
Daniel Sandler [Thu, 20 Jan 2011 01:27:15 +0000 (17:27 -0800)]
am
60720a29: Merge "Notification & settings panel redesign." into honeycomb
* commit '
60720a2991f424c867141b23062870e479ece80c':
Notification & settings panel redesign.
Stephen Hines [Thu, 20 Jan 2011 01:24:53 +0000 (17:24 -0800)]
Merge "Clean up RS math fp library functions." into honeycomb
Daniel Sandler [Thu, 20 Jan 2011 01:24:42 +0000 (17:24 -0800)]
Merge "Notification & settings panel redesign." into honeycomb
Adam Powell [Thu, 20 Jan 2011 01:14:16 +0000 (17:14 -0800)]
am
ed58d8ed: Merge "Fix bug
3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
* commit '
ed58d8ed8a50cbd8c5e01c4e51bcbbe4341d1dfd':
Fix bug
3112733 - Missing TLS encryption option in manual email account setup
Adam Powell [Thu, 20 Jan 2011 01:11:37 +0000 (17:11 -0800)]
Merge "Fix bug
3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
Jeff Brown [Thu, 20 Jan 2011 01:05:57 +0000 (17:05 -0800)]
am
2cb866b9: Merge "Never drag scroll views with no children." into honeycomb
* commit '
2cb866b948c38923b31331a9b2f031eb9d791e6e':
Never drag scroll views with no children.
Mathias Agopian [Thu, 20 Jan 2011 01:03:51 +0000 (17:03 -0800)]
am
8bb9131c: Merge "fix [
3367893] Rotating device on YouTube\'s home screen several times kills system_server" into honeycomb
* commit '
8bb9131c663b5c4548eed1d9f964d06bccfc4da6':
fix [
3367893] Rotating device on YouTube's home screen several times kills system_server
Jeff Brown [Thu, 20 Jan 2011 01:03:08 +0000 (17:03 -0800)]
Merge "Never drag scroll views with no children." into honeycomb
Mathias Agopian [Thu, 20 Jan 2011 01:01:22 +0000 (17:01 -0800)]
Merge "fix [
3367893] Rotating device on YouTube's home screen several times kills system_server" into honeycomb
Romain Guy [Thu, 20 Jan 2011 00:53:28 +0000 (16:53 -0800)]
am
eefc8248: Merge "Fix toasts." into honeycomb
* commit '
eefc82483a90f641275db3084b78c8254cc45046':
Fix toasts.
Romain Guy [Thu, 20 Jan 2011 00:51:44 +0000 (16:51 -0800)]
Merge "Fix toasts." into honeycomb
Jason Sams [Thu, 20 Jan 2011 00:51:20 +0000 (16:51 -0800)]
am
1368436e: Merge "Check and propogate errors from llvm." into honeycomb
* commit '
1368436e428e2af1241bf88cb0688f288f96da1c':
Check and propogate errors from llvm.
Jason Sams [Thu, 20 Jan 2011 00:49:17 +0000 (16:49 -0800)]
Merge "Check and propogate errors from llvm." into honeycomb
Christopher Tate [Thu, 20 Jan 2011 00:43:14 +0000 (16:43 -0800)]
am
28f0a53a: Merge "Fail more gracefully when window state changes during drags" into honeycomb
* commit '
28f0a53a882a39bc22bc5892250411cadf6c0d5d':
Fail more gracefully when window state changes during drags
Amith Yamasani [Thu, 20 Jan 2011 00:43:10 +0000 (16:43 -0800)]
am
1c0012e1: Merge "Ensure that the column is valid before querying." into honeycomb
* commit '
1c0012e103a380489fe4a150247cd226de9a89a6':
Ensure that the column is valid before querying.
Christopher Tate [Thu, 20 Jan 2011 00:41:14 +0000 (16:41 -0800)]
Merge "Fail more gracefully when window state changes during drags" into honeycomb
Amith Yamasani [Thu, 20 Jan 2011 00:40:14 +0000 (16:40 -0800)]
Merge "Ensure that the column is valid before querying." into honeycomb
Mathias Agopian [Thu, 20 Jan 2011 00:34:56 +0000 (16:34 -0800)]
am
0fb9c5dc: Merge "improve SurfaceFlinger \'dumpsys\' log" into honeycomb
* commit '
0fb9c5dcc76af44a1f6e3c9243d03a0a222ad2bb':
improve SurfaceFlinger 'dumpsys' log
Mathias Agopian [Thu, 20 Jan 2011 00:31:32 +0000 (16:31 -0800)]
Merge "improve SurfaceFlinger 'dumpsys' log" into honeycomb
Dianne Hackborn [Thu, 20 Jan 2011 00:30:53 +0000 (16:30 -0800)]
am
b26a651b: Merge "Hook up large heap API." into honeycomb
* commit '
b26a651b47b5fc90a6685477aff5b76fdd1787f1':
Hook up large heap API.
Jason Sams [Thu, 20 Jan 2011 00:28:41 +0000 (16:28 -0800)]
am
9dd9d021: Merge "Expose unchecked copyFrom variants." into honeycomb
* commit '
9dd9d021896e350df983baf7174d980a43533e69':
Expose unchecked copyFrom variants.
Dianne Hackborn [Thu, 20 Jan 2011 00:28:31 +0000 (16:28 -0800)]
Merge "Hook up large heap API." into honeycomb
Jason Sams [Thu, 20 Jan 2011 00:27:06 +0000 (16:27 -0800)]
Merge "Expose unchecked copyFrom variants." into honeycomb
Joe Onorato [Thu, 20 Jan 2011 00:16:18 +0000 (16:16 -0800)]
am
b2b14397: Merge "Cut a hole in the status bar for events when the IME is open." into honeycomb
* commit '
b2b14397e522da4d779b19415eab49967a7922d9':
Cut a hole in the status bar for events when the IME is open.
Mathias Agopian [Thu, 20 Jan 2011 00:15:53 +0000 (16:15 -0800)]
improve SurfaceFlinger 'dumpsys' log
list the purgatory, which shows windows that have been closed,
but for which the client still has references.
Change-Id: I5168bb88cb328d5d77d71d0871deb9190f493126
Joe Onorato [Thu, 20 Jan 2011 00:14:14 +0000 (16:14 -0800)]
Merge "Cut a hole in the status bar for events when the IME is open." into honeycomb
Joe Onorato [Thu, 20 Jan 2011 00:14:03 +0000 (16:14 -0800)]
am
4defed42: Merge changes I3814b491,Ic3a7f4c0 into honeycomb
* commit '
4defed42916dfe086eb450ca02d9c9a53e2018d9':
Pass SkRegion::toString() through to java.
Remove optimization to isInContentArea that wasn't working.
Mike Lockwood [Thu, 20 Jan 2011 00:11:55 +0000 (16:11 -0800)]
am
62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
* commit '
62097ad654bcab30057f56b46bbac5c41cfe9ec0':
@hide MediaStore.ACTION_MTP_SESSION_END
Joe Onorato [Thu, 20 Jan 2011 00:11:04 +0000 (16:11 -0800)]
Merge changes I3814b491,Ic3a7f4c0 into honeycomb
* changes:
Pass SkRegion::toString() through to java.
Remove optimization to isInContentArea that wasn't working.
Mike Lockwood [Thu, 20 Jan 2011 00:09:49 +0000 (16:09 -0800)]
Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
Gilles Debunne [Thu, 20 Jan 2011 00:09:43 +0000 (16:09 -0800)]
am
0c44d1db: Merge "Race condition patched in Email autocompletion." into honeycomb
* commit '
0c44d1dbb152ed16df4eb2af39157f3d281323d9':
Race condition patched in Email autocompletion.
Gilles Debunne [Thu, 20 Jan 2011 00:08:20 +0000 (16:08 -0800)]
Merge "Race condition patched in Email autocompletion." into honeycomb
Gloria Wang [Wed, 19 Jan 2011 23:59:13 +0000 (15:59 -0800)]
am
a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit '
a4b0cdc96e309168517f4b4da24b7647668f99a7':
More fix for 64 bit offset.
Gloria Wang [Wed, 19 Jan 2011 23:57:23 +0000 (15:57 -0800)]
Merge "More fix for 64 bit offset." into honeycomb
Joe Onorato [Wed, 19 Jan 2011 23:34:04 +0000 (15:34 -0800)]
am
cb109a0e: Add docs for Notification.Builder.
* commit '
cb109a0eeaca12cdd954c567da4fc5f45a23213b':
Add docs for Notification.Builder.
Jaikumar Ganesh [Wed, 19 Jan 2011 23:24:33 +0000 (15:24 -0800)]
am
7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
* commit '
7457b36b92490daa6cd7e346919fad74a4b92eb9':
Make connection / disconnect failure more robust.
Andreas Huber [Wed, 19 Jan 2011 23:24:28 +0000 (15:24 -0800)]
am
3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
* commit '
3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
Prefill the cache before trying to instantiate the media extractor.
Brad Fitzpatrick [Wed, 19 Jan 2011 23:19:08 +0000 (15:19 -0800)]
resolved conflicts for merge of
9240f16d to honeycomb-plus-aosp
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
Jaikumar Ganesh [Wed, 19 Jan 2011 23:13:37 +0000 (15:13 -0800)]
Merge "Make connection / disconnect failure more robust." into honeycomb
Andreas Huber [Wed, 19 Jan 2011 23:12:41 +0000 (15:12 -0800)]
Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb